diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index f518c5f7e3..ec68d729e5 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -55,7 +55,7 @@ export default {
     },
     methods: {
         handleConditionResult(args) {
-            this.$emit('condition-result-updated', {
+            this.$emit('conditionResultUpdated', {
                 id: this.conditionIdentifier,
                 result: args.data.result
             })
diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index ddb8fad8ab..fda6fa9033 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -75,10 +75,18 @@
                     <div v-else>
                         <Condition :condition-identifier="conditionIdentifier"
                                    :current-condition-identifier="currentConditionIdentifier"
-                        />
-                    </div>
-                </li>
-            </ul>
+                                   @update-current-condition="updateCurrentCondition"
+                                   @remove-condition="removeCondition"
+                                   @condition-result-updated="handleConditionResult"
+                    />
+                </div>
+                <div v-else>
+                    <Condition :condition-identifier="conditionIdentifier"
+                               :current-condition-identifier="currentConditionIdentifier"
+                               @condition-result-updated="handleConditionResult"
+                    />
+                </div>
+            </div>
         </div>
     </div>
 </section>
@@ -189,16 +197,16 @@ export default {
                     break;
                 }
             }
-            this.$emit('current-condition-updated', currentConditionIdentifier);
+            this.$emit('currentConditionUpdated', currentConditionIdentifier);
         },
         addTelemetry(telemetryDomainObject) {
             this.telemetryObjs.push(telemetryDomainObject);
         },
         addCondition(event, isDefault) {
-            let conditionDO = this.getConditionDomainObject(!!isDefault);
-            //persist the condition DO so that we can do an openmct.objects.get on it and only persist the identifier in the conditionCollection of conditionSet
-            this.openmct.objects.mutate(conditionDO, 'created', new Date());
-            this.conditionCollection.unshift(conditionDO.identifier);
+            let conditionDomainObject = this.getConditionDomainObject(!!isDefault);
+            //persist the condition domain object so that we can do an openmct.objects.get on it and only persist the identifier in the conditionCollection of conditionSet
+            this.openmct.objects.mutate(conditionDomainObject, 'created', new Date());
+            this.conditionCollection.unshift(conditionDomainObject.identifier);
             this.persist();
         },
         updateCurrentCondition(identifier) {
@@ -224,10 +232,10 @@ export default {
                 },
                 summary: 'summary description'
             };
-            let conditionDOKeyString = this.openmct.objects.makeKeyString(conditionObj.identifier);
-            let newDO = this.instantiate(conditionObj, conditionDOKeyString);
+            let conditionDomainObjectKeyString = this.openmct.objects.makeKeyString(conditionObj.identifier);
+            let newDomainObject = this.instantiate(conditionObj, conditionDomainObjectKeyString);
 
-            return newDO.useCapability('adapter');
+            return newDomainObject.useCapability('adapter');
         },
         updateCondition(updatedCondition) {
             //TODO: this should only happen for reordering
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 6660e4e241..5a50c73e2a 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -118,7 +118,7 @@
                                             </select>
                                         </span>
                                         <span class="controls">
-                                            <select v-model="selectedOperationKey[currentCriteria.key]"
+                                            <select v-model="selectOperationName"
                                                     @change="setInputValueVisibility"
                                             >
                                                 <option value="">- Select Comparison -</option>
@@ -190,10 +190,9 @@ export default {
             telemetryObject: this.telemetryObject,
             telemetryMetadata: this.telemetryMetadata,
             operations: OPERATIONS,
-            trigger: 'all',
-            selectedMetaDataKey: {},
-            selectedTelemetryKey: {},
-            selectedOperationKey: {},
+            selectedMetaDataKey: '',
+            selectedTelemetryKey: '',
+            selectOperationName: '',
             selectedOutputKey: '',
             stringOutputField: false,
             comparisonValueField: false,
@@ -282,13 +281,13 @@ export default {
             }
         },
         handleConditionResult(args) {
-            this.$emit('condition-result-updated', {
+            this.$emit('conditionResultUpdated', {
                 id: this.conditionIdentifier,
                 result: args.data.result
             })
         },
         removeCondition(ev) {
-            this.$emit('remove-condition', this.conditionIdentifier);
+            this.$emit('removeCondition', this.conditionIdentifier);
         },
         cloneCondition(ev) {
             this.$emit('clone-condition', {
@@ -297,10 +296,11 @@ export default {
             });
         },
         setOutput() {
-            if (this.condition.definition.output !== 'false' && this.condition.definition.output !== 'true') {
+            let conditionOutput = this.condition.definition.output;
+            if (conditionOutput !== 'false' && conditionOutput !== 'true') {
                 this.selectedOutputKey = this.outputOptions[2].key;
             } else {
-                if (this.condition.definition.output === 'true') {
+                if (conditionOutput === 'true') {
                     this.selectedOutputKey = this.outputOptions[1].key;
                 } else {
                     this.selectedOutputKey = this.outputOptions[0].key;
@@ -363,11 +363,12 @@ export default {
             return this.currentCriteria && this.currentCriteria.key;
         },
         updateConditionCriteria() {
-            if (this.currentCriteria) {
-                this.currentCriteria.selectedTelemetryKey = this.selectedTelemetryKey[this.currentCriteria[0].key];
-                this.currentCriteria.metaDataKey = this.selectedMetaDataKey[this.currentCriteria[0].key];
-                this.currentCriteria.operation = this.selectedOperationKey[this.currentCriteria[0].key];
-                this.currentCriteria.input = this.operationValue[this.currentCriteria[0].key];
+            if (this.condition.definition.criteria.length) {
+                let criterion = this.condition.definition.criteria[0];
+                criterion.key = this.selectedTelemetryKey;
+                criterion.metaDataKey = this.selectedMetaDataKey;
+                criterion.operation = this.selectOperationName;
+                criterion.input = [this.operationValue];
             }
         },
         persist() {
@@ -382,10 +383,11 @@ export default {
             }
         },
         setInputValueVisibility(ev) {
-            if (this.selectedOperationKey[this.currentCriteria.key] !== 'isUndefined' && this.selectedOperationKey[this.currentCriteria.key] !== 'isDefined') {
-                this.comparisonValueField = true;
-            } else {
-                this.comparisonValueField = false;
+            for (let i=0, ii=this.operations.length; i < ii; i++) {
+                if (this.selectOperationName === this.operations[i].name) {
+                    this.comparisonValueField = this.operations[i].inputCount > 0;
+                    break;
+                }
             }
             //find the criterion being updated and set the operation property
         },
@@ -395,7 +397,7 @@ export default {
             this.updateTelemetry();
         },
         updateCurrentCondition() {
-            this.$emit('update-current-condition', this.conditionIdentifier);
+            this.$emit('updateCurrentCondition', this.conditionIdentifier);
         }
     }
 }
diff --git a/src/plugins/condition/components/ConditionSet.vue b/src/plugins/condition/components/ConditionSet.vue
index a09bf2085c..ff72c552a5 100644
--- a/src/plugins/condition/components/ConditionSet.vue
+++ b/src/plugins/condition/components/ConditionSet.vue
@@ -5,7 +5,7 @@
             <CurrentOutput :condition="currentCondition" />
             <TestData :is-editing="isEditing" />
             <ConditionCollection :is-editing="isEditing"
-                                 @current-condition-updated="updateCurrentCondition"
+                                 @currentConditionUpdated="updateCurrentCondition"
             />
         </div>
     </div>