Route parsing bugfixes