query string simplification