starting to improve logic for fields that can be plural