restrict order to functions

Merged Praetorius, Simon requested to merge issue/minor_order_changes into master

Merge request reports