Add query filter support