Issue #1583 and Issue #1590 trimming down list of fields available for defining eligibility requirements