Account for query vars in urls for url generator