Routes ordering fixup