Get rid of mucking about with query_vars