Fixed issue where the field matches were not included correctly