Revert "Fix route regression introduced in ff0f7cc40aed752580c0483ed9083ed1727e7b5b per #514"

This reverts commit 89abd640345d96bbc273074c9a58b523a814391d.
Proper fix and tests for v1 screen URLs, close #514.
Merge branch 'master' of github.com:concerto/concerto