separate querry from modifier