move more regex stuff in route_macros