diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
index af4e88b9d9..47d2b6eae0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
@@ -476,7 +476,8 @@ public class PostShef {
                     data.setCreationDateObj(d);
                     data.setCreationDate("1970-01-01 00:00:00");
                 }
-
+                
+                locId = data.getLocationId();
                 String key = locId + prodId + data.getObservationTime();
                 if (idLocations.containsKey(key)) {
                     postLocData = idLocations.get(key);
@@ -2099,9 +2100,9 @@ public class PostShef {
         String telem = null;
         String sql = null;
         Object[] oa = null;
-
+        String key = locId + data.getPeTsE();
         try {
-            if (!ingestSwitchMap.containsKey(locId)) {
+            if (!ingestSwitchMap.containsKey(key)) {
                 errorMsg.append("Error getting connection to IHFS Database");
                 sql = "select lid, pe, dur, ts, extremum, ts_rank, ingest, ofs_input, stg2_input from IngestFilter where lid = '"
                         + locId + "'";
@@ -2138,11 +2139,11 @@ public class PostShef {
                     }
                 }
 
-                ingestSwitchMap.put(locId, ingestSwitch);
+                ingestSwitchMap.put(key, ingestSwitch);
             }
 
-            matchFound = ingestSwitchMap.containsKey(locId);
-            ingestSwitch = ingestSwitchMap.get(locId);
+            matchFound = ingestSwitchMap.containsKey(key);
+            ingestSwitch = ingestSwitchMap.get(key);
 
             /*
              * if there is no ingest record for this entry, then check if the