Stop assuming we have a query string