don't remove query vars from original query

Alternative fix for #430