removing issues with persistant query values