Added filter query feature