If a new criteria is added on a secondary field, then all values for the existing primary field should be created also. Linked to #220