diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/MetaDataManager.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/MetaDataManager.java
index 30e5eb0268..3c9a68d62e 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/MetaDataManager.java
+++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/MetaDataManager.java
@@ -69,6 +69,7 @@ import com.raytheon.uf.viz.datadelivery.filter.config.xml.FilterTypeXML;
  * Dec 10, 2012 1259       bsteffen     Switch Data Delivery from LatLon to referenced envelopes.
  * Jun 04, 2013  223       mpduff       Add data set type to filter.
  * Jul 05, 2013 2137       mpduff       Single data type.
+ * Jul 29, 2013 2196       bgonzale     Added levels isEmpty check.
  * 
  * </pre>
  * 
@@ -254,7 +255,8 @@ public class MetaDataManager {
                 List<String> levels = DataDeliveryHandlers
                         .getParameterHandler().getDataLevelTypeDescriptions(
                                 dataTypeList);
-                if (levels != null && levels.get(0) != null) {
+                if (levels != null && !levels.isEmpty()
+                        && levels.get(0) != null) {
                     allAvailableLevels.addAll(levels);
                 }
             } catch (RegistryHandlerException e) {
diff --git a/edexOsgi/build.edex/esb/conf/modes.xml b/edexOsgi/build.edex/esb/conf/modes.xml
index 2bf8d8497e..d83ce5a696 100644
--- a/edexOsgi/build.edex/esb/conf/modes.xml
+++ b/edexOsgi/build.edex/esb/conf/modes.xml
@@ -186,30 +186,20 @@
         <includeMode>statsTemplate</includeMode>
 	</mode>
 	<mode name="registry">
-		<include>ebxml.*\.xml</include>
+        <!-- WFO Registry production mode -->
+        <include>ebxml.*\.xml</include>
         <includeMode>statsTemplate</includeMode>
         <includeMode>dataDeliveryTemplate</includeMode>
         <exclude>.*datadelivery-ncf.*</exclude>
+        <exclude>harvester-*</exclude>
+        <exclude>crawler-*</exclude>
 	</mode>
-    <!-- Eventually these two modes will either become the production versions,
-         or the existing registry server will be migrated to one or the other. -->
     <mode name="ncfRegistry">
         <include>ebxml.*\.xml</include>
         <includeMode>statsTemplate</includeMode>
         <includeMode>dataDeliveryTemplate</includeMode>
         <exclude>.*datadelivery-wfo.*</exclude>
     </mode>
-    <mode name="wfoRegistry">
-        <include>ebxml.*\.xml</include>
-        <includeMode>statsTemplate</includeMode>
-        <includeMode>dataDeliveryTemplate</includeMode>
-        <!-- TODO: These patterns can be commented out when this mode is productionized -->
-        <include>.*sbn-simulator.*</include>
-        <!-- END TODO -->
-        <exclude>.*datadelivery-ncf.*</exclude>
-        <exclude>harvester-*</exclude>
-        <exclude>crawler-*</exclude>
-    </mode>
 
     <mode name="statsTemplate" template="true">
         <include>event-common.xml</include>
@@ -261,6 +251,17 @@
 
 	<!-- modes listed below are not supported in a production setting, they 
 		are for DEVELOPMENT purposes only -->
+    <mode name="devWfoRegistry">
+         <!-- This is the development WFO registry mode.
+         It runs the sbn simulator for development. -->
+        <include>.*sbn-simulator.*</include>
+        <include>ebxml.*\.xml</include>
+        <includeMode>statsTemplate</includeMode>
+        <includeMode>dataDeliveryTemplate</includeMode>
+        <exclude>.*datadelivery-ncf.*</exclude>
+        <exclude>harvester-*</exclude>
+        <exclude>crawler-*</exclude>
+    </mode>
 	<mode name="grib">
 		<include>grib-common.xml</include>
 		<include>grib-decode.xml</include>
diff --git a/edexOsgi/build.edex/esb/etc/wfoRegistry.sh b/edexOsgi/build.edex/esb/etc/devWfoRegistry.sh
similarity index 97%
rename from edexOsgi/build.edex/esb/etc/wfoRegistry.sh
rename to edexOsgi/build.edex/esb/etc/devWfoRegistry.sh
index 075f621b83..6d10718d06 100644
--- a/edexOsgi/build.edex/esb/etc/wfoRegistry.sh
+++ b/edexOsgi/build.edex/esb/etc/devWfoRegistry.sh
@@ -22,7 +22,7 @@
 export MAX_MEM=1536 # in Meg
 export MAX_PERM_SIZE=192m
 export METADATA_POOL_MIN=10
-export EDEX_DEBUG_PORT=5009
+export EDEX_DEBUG_PORT=5013
 export EDEX_JMX_PORT=1620
 export LOG_CONF=logback-registry.xml
 export MGMT_PORT=9605
diff --git a/edexOsgi/build.edex/esb/etc/registry.sh b/edexOsgi/build.edex/esb/etc/registry.sh
index 075f621b83..763cdabf8a 100644
--- a/edexOsgi/build.edex/esb/etc/registry.sh
+++ b/edexOsgi/build.edex/esb/etc/registry.sh
@@ -22,7 +22,7 @@
 export MAX_MEM=1536 # in Meg
 export MAX_PERM_SIZE=192m
 export METADATA_POOL_MIN=10
-export EDEX_DEBUG_PORT=5009
+export EDEX_DEBUG_PORT=5012
 export EDEX_JMX_PORT=1620
 export LOG_CONF=logback-registry.xml
 export MGMT_PORT=9605
@@ -31,4 +31,4 @@ export MGMT_PORT=9605
 export EBXML_REGISTRY_WEBSERVER_PORT=8082
 export EBXML_REGISTRY_WEBSERVER_CONFIDENTIAL_PORT=8444
 export EBXML_QUERY_SERVICE_SOAP_PORT=10144
-export EBXML_THRIFT_SERVICE_PORT=9588
\ No newline at end of file
+export EBXML_THRIFT_SERVICE_PORT=9588