Fixed issue where fields-not-referenced under field-group was ignored