Add extra filtering for fields