UCJEPS-343: Additional modifications to fieldLocCounty options.