Put keyword router endpoints on the correct side.
Merge branch 'feature/issue-558-fix-router-directionality' into develop-frontend