always include query string in token