Added data-condition and data-operator to each settings field