Added option to filter on fields per issue #1