adding query filter support