new route helper, refactoring and small fixes
Merge remote-tracking branch 'origin/Development' into Development