Updated routing to improve sub route matches, and consistency throughout