Fix Query Filter