Tweaks url routing behavior as suggest in the PR thread