query filter enhancements