diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
index c6ca1beba3..939444f432 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
@@ -722,15 +722,6 @@ public class StormTrackDisplay implements IRenderable {
                     || currentState.newDuration != -1 || update) {
                 if (currentState.timePoints != null
                         && currentState.timePoints.length != frameCount) {
-                    // need to set theAnchorPoint and theAnchorIndex here
-                    // because timePoints get erased before we get to updateAnchorPoint
-                    DataTime frameTime = paintProps.getDataTime();
-                    for (int j=0;j<currentState.timePoints.length;j++){
-                        if (frameTime.equals(currentState.timePoints[j].time)) {
-                            theAnchorPoint = currentState.timePoints[j].coord;
-                            theAnchorIndex = j;
-                        }
-                    }
                     currentState.timePoints = null;
                 }
 
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
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
index 2e1c9bd44e..c9d739e623 100755
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
@@ -11,6 +11,7 @@
 #####    Evan Bookbinder    05-05-2013 handleClosesPoints and 3rd bullet changes (OVER & now) 
 #####    Evan Bookbinder    09-20-2013 Fixed rural area otherPoints in pathcast section, added rural phrase
 #####         Qinglu Lin    03-17-2014 DR 16309. Updated inserttorwatches and insertsvrwatches. 
+#####         Qinglu Lin    05-21-2014 DR 16309. Updated inserttorwatches and insertsvrwatches by changing 'FOR##' to 'FOR ##'. 
 ####################################################################################################
 #*
 Mile Marker Test Code                                     
@@ -202,7 +203,7 @@ ${dateUtil.period(${watches.getLatestTorTime()},${timeFormat.plain}, 15, ${local
 #if(${secondtimezone})
 /${dateUtil.format(${watch.getEndTime()}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
 #end
- FOR##
+ FOR ##
 #set($numPortions = ${list.size(${watch.getPortions()})})
 #set($count = 0)
 #foreach(${portion} in ${watch.getPortions()})
@@ -236,7 +237,7 @@ ${dateUtil.period(${watches.getLatestSvrTime()},${timeFormat.plain}, 15, ${local
 #if(${secondtimezone})
 /${dateUtil.format(${watch.getEndTime()}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
 #end
- FOR##
+ FOR ##
 #set($numPortions = ${list.size(${watch.getPortions()})})
 #set($count = 0)
 #foreach(${portion} in ${watch.getPortions()})