Isn't this a generalized bugfix rather than something specific to query params? (i think it's a bug even when query params aren't turned on...)