diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
index 0371bba778..c6e69f9778 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
@@ -19,7 +19,7 @@
 		factory-method="getInstance" />
 		
 	<bean id="gribTableLookup" class="com.raytheon.edex.util.grib.GribTableLookup"
-		factory-method="getInstance" depends-on="gridRegistered, queryDataRegistered" />
+		factory-method="getInstance" depends-on="gridRegistered, queryDataRegistered, levelFactoryInitialized" />
   	
     <bean id="gribModelLookup"
 		class="com.raytheon.edex.plugin.grib.util.GribModelLookup"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
index 749372c39b..78f78557ec 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
@@ -29,18 +29,19 @@
 		<exclude>grid-staticdata-process.xml</exclude>
 	</mode>
 	<mode name="ingestGrib">
-		<include>time-common.xml</include>
-		<include>auth-common.xml</include>
-		<include>grib-decode.xml</include>
-		<include>ncgrib-file-endpoint.xml</include>
-		<include>grid-staticdata-process.xml</include>
-		<include>level-common.xml</include>
-	 	<include>grid-common.xml</include>
-	 	<include>gridcoverage-common.xml</include>
-	 	<include>parameter-common.xml</include>	 	
-		<include>persist-ingest.xml</include>
-		<include>management-common.xml</include>
-	 	<include>database-common.xml</include>
+        <include>time-common.xml</include>
+        <include>auth-common.xml</include>
+        <include>grib-decode.xml</include>
+        <include>ncgrib-file-endpoint.xml</include>
+        <include>grid-staticdata-process.xml</include>
+        <include>level-common.xml</include>
+        <include>levelhandler-common.xml</include>        
+        <include>grid-common.xml</include>
+        <include>gridcoverage-common.xml</include>
+        <include>parameter-common.xml</include>	 	
+        <include>persist-ingest.xml</include>
+        <include>management-common.xml</include>
+        <include>database-common.xml</include>
         <include>event-ingest.xml</include>
         <includeMode>statsTemplate</includeMode>
 	</mode>