query filter issues fix