diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py b/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
index 8b263bd0ab..9b41e7087d 100644
--- a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
+++ b/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
@@ -224,8 +224,14 @@ class Procedure (SmartScript.SmartScript):
             hazardKey = selectedHazard
             
         defaultHazKey = ""
-        if len(defaultSegment) > 0 and defaultHazard is not None:
-            defaultHazKey = defaultHazard + ":" + defaultSegment
+        if defaultHazard is not None:
+            index = string.find(defaultHazard, " ")
+            if index != -1:
+                defaultHazard = defaultHazard[0:index]
+            defaultHazKey = defaultHazard
+            
+            if len(defaultSegment) > 0:
+                defaultHazKey += ":" + defaultSegment
 
         weName = self._hazUtils._makeTempWEName(hazardKey)        
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java
index cfa3ff0cea..d7ff45c47a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java
@@ -166,6 +166,8 @@ public class SatelliteMenuUtil extends AbstractMenuUtil {
             sub.key = "entity";
             sub.value = "GOES%";
             ((CommonIncludeMenuContribution) file.contributions[0]).substitutions[4] = sub;
+            toXml(fileOCONUS, "menus" + File.separator + "satellite" + File.separator
+                    + "baseDerivedProductsImagery.xml");
         } else {
             // decide on east conus or west conus
             ((CommonIncludeMenuContribution) file.contributions[0]).fileName = new File(
@@ -234,9 +236,6 @@ public class SatelliteMenuUtil extends AbstractMenuUtil {
         toXml(file, "menus" + File.separator + "satellite" + File.separator
                 + "baseComposite.xml");
         
-        toXml(fileOCONUS, "menus" + File.separator + "satellite" + File.separator
-                + "baseDerivedProductsImagery.xml");
-        
         statusHandler.info("Finished creating satellite menus");
     }