query filter for each agent type with changes