added filter for more fields