Switched uri-dispatcher to not depend on PAGE