Missing Condition causing Additional set of fields to appear