add workaround for handling query params from rewritten query string