diff --git a/orion-server/src/main/java/com/pinterest/orion/server/api/Ami.java b/orion-server/src/main/java/com/pinterest/orion/server/api/Ami.java
index 5e53902..45e6d6b 100644
--- a/orion-server/src/main/java/com/pinterest/orion/server/api/Ami.java
+++ b/orion-server/src/main/java/com/pinterest/orion/server/api/Ami.java
@@ -29,7 +29,7 @@ public class Ami {
    *
    * @param amiId - for AWS, the string "ami-" and a sequence of 17 characters
    * @param applicationEnvironment - comma-separated list of environments (dev, test,
-   *                                 staging, prod) supported by this ami
+   *                                 stage, prod, m10n) supported by this ami
    * @param creationDate - ami creation date, UTC
    * @return the new Ami instance
    */
diff --git a/orion-server/src/main/resources/webapp/src/basic-components/Ami.js b/orion-server/src/main/resources/webapp/src/basic-components/Ami.js
index e0bfbc1..b37d503 100644
--- a/orion-server/src/main/resources/webapp/src/basic-components/Ami.js
+++ b/orion-server/src/main/resources/webapp/src/basic-components/Ami.js
@@ -54,12 +54,18 @@ function Ami({ amiList, requestAmiList, envTypes, requestEnvTypes, updateAmiTag
     setArch(event.target.value);
   };
   const [selected, setSelected] = React.useState([]);
+  const [env, setEnv] = React.useState({});
+  if (envTypes !== undefined && Object.keys(env).length == 0) {
+    const targetEnv = {};
+    envTypes.forEach(value => { targetEnv[value] = false; });
+    setEnv(targetEnv);
+  }
   const handleTableRowSelect = (id, row) => {
     setSelected(id);
     setAppEnv(row.applicationEnvironment);
     const envs_str = row.applicationEnvironment;
     const envs = envs_str.split(',');
-    env.dev = env.test = env.staging = env.prod = false;
+    envTypes.forEach(envType => { env[envType] = false; });
     for (const env_str of envs)
       env[env_str] = true;
   };
@@ -67,10 +73,6 @@ function Ami({ amiList, requestAmiList, envTypes, requestEnvTypes, updateAmiTag
   const handleAppEnvChange = event => {
     setAppEnv(event.target.value);
   };
-  const envMap = {};
-  if (envTypes !== undefined)
-    envTypes.forEach(value => { envMap[value] = false; });
-  const [env] = React.useState(envMap);
   const handleCheckboxChange = (event) => {
     env[event.target.name] = event.target.checked;
     const newAppEnv = [];
@@ -86,6 +88,8 @@ function Ami({ amiList, requestAmiList, envTypes, requestEnvTypes, updateAmiTag
     requestAmiList(parms.join('&'));
     requestEnvTypes();
   }
+  console.log("env = " + JSON.stringify(env))
+  // console.log("envMap = " + JSON.stringify(envMap))
 
   if (!amiList)
     amiList = [];