Revise approach to query params

This is for the query params api rewrite