Use route parameter instead of option
Merge branch 'redirect' into allFixes