Tidy up query string support