diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml
index 184cd65e9a..cefa78ee98 100644
--- a/edexOsgi/build.edex/esb/conf/spring/edex.xml
+++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml
@@ -299,6 +299,11 @@
    <bean class="com.raytheon.uf.common.geospatial.LogRedirector" factory-method="setGeotoolsLogFactory">
         <constructor-arg value="org.geotools.util.logging.Log4JLoggerFactory" />
    </bean>
+      
+   <bean id="spatialQueryFactory" class="com.raytheon.uf.common.geospatial.SpatialQueryFactory"
+        factory-method="setImplementation">
+        <constructor-arg value="com.raytheon.edex.common.SpatialDbQuery"/>    
+   </bean>
 
     <!-- Holds the registry of request routers by server key -->
     <bean id="handlerRegistry" class="com.raytheon.uf.edex.requestsrv.HandlerRegistry"
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF
index 2202b7f607..64a69705ea 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Radar
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.radar
 Bundle-Version: 1.14.1.qualifier
-Eclipse-RegisterBuddy: com.raytheon.uf.common.geospatial
+Eclipse-RegisterBuddy: org.geotools
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
@@ -18,6 +18,7 @@ Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  com.raytheon.uf.common.util;bundle-version="1.12.1174",
  javax.persistence;bundle-version="1.0.0",
  org.hibernate;bundle-version="1.0.0",
+ org.geotools;bundle-version="10.5.0",
  com.raytheon.uf.common.numeric;bundle-version="1.14.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy