Query parameter reformatted to be more extensible and routing more robust