Remove query values: avoid loop