diff --git a/awx/ui/client/lib/components/input/group.directive.js b/awx/ui/client/lib/components/input/group.directive.js
index cdb14b0e58..7570a42cf3 100644
--- a/awx/ui/client/lib/components/input/group.directive.js
+++ b/awx/ui/client/lib/components/input/group.directive.js
@@ -99,7 +99,7 @@ function AtInputGroupController ($scope, $compile) {
             config._component = 'at-input-select';
             config._format = 'array';
             config._data = input.choices;
-            config._exp = 'index as choice for (index, choice) in state._data';
+            config._exp = 'choice for (index, choice) in state._data';
         } else {
             let preface = vm.strings.get('group.UNSUPPORTED_ERROR_PREFACE');
             throw new Error(`${preface}: ${input.type}`)
diff --git a/awx/ui/client/lib/components/input/select.directive.js b/awx/ui/client/lib/components/input/select.directive.js
index b86f1f8933..4167eac0e5 100644
--- a/awx/ui/client/lib/components/input/select.directive.js
+++ b/awx/ui/client/lib/components/input/select.directive.js
@@ -59,7 +59,7 @@ function AtInputSelectController (baseInputController, eventService) {
 
     vm.updateDisplayModel = () => {
         if (scope.state._format === 'array') {
-            scope.displayModel = scope.state._data[scope.state._value];
+            scope.displayModel = scope.state._value;
         } else if (scope.state._format === 'objects') {
             scope.displayModel = scope.state._value[scope.state._display];
         } else if (scope.state._format === 'grouped-object') {