added filter on fields