diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
index 485d42cc88..094dcb01f1 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
@@ -65,7 +65,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Feb 2, 2014  16201      snaples      Added saved data flag support
  * Apr 28, 2014 16707      snaples     Added code to save and set location of dialog box when moved.
  * Jan 12, 2015 16993      snaples     Restored code for Substitute Field Combo box.
- * 
+ * Feb 26, 2015 17209      cgobs       Ensured that there is an initial selection of Substitution field, prevents empty selection.
  * 
  * </pre>
  * 
@@ -387,16 +387,22 @@ public class DrawPolygonDlg extends CaveSWTDialog {
   //      spaceLabel.setText("*****  ");
         
         int selectedFieldIndex = 0;
-        
+        boolean found = false;
         //find the index of the selected field
         for (selectedFieldIndex = 0; selectedFieldIndex < displayFieldDataArray.length; selectedFieldIndex++)
         {
             if (displayFieldDataArray[selectedFieldIndex] == subType)
             {
+                found = true;
                 break;
             }
         }
         
+        if (!found)
+        {
+            selectedFieldIndex = 0;
+        }
+        
         //create and initialize the display field type name array
         displayTypeNameArray = new String[displayFieldDataArray.length];
         
@@ -411,27 +417,42 @@ public class DrawPolygonDlg extends CaveSWTDialog {
         fieldTypeCombo.setTextLimit(35);
         fieldTypeCombo.setLayoutData(gd);
         fieldTypeCombo.setItems(displayTypeNameArray);
-        fieldTypeCombo.select(selectedFieldIndex);
+       // fieldTypeCombo.select(selectedFieldIndex);
         
         fieldTypeCombo.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
-            	String selectedFieldString = fieldTypeCombo.getText();
+                
+                setSubstitutionField();
+                
+//            	String selectedFieldString = fieldTypeCombo.getText();
+ 
  //           	System.out.println("DrawPolygon.createFieldCombo(): selectedFieldString =  " +
  //           						selectedFieldString);
             	
-            	subType = DisplayFieldData.fromDisplayNameString(selectedFieldString);
+ //           	subType = DisplayFieldData.fromDisplayNameString(selectedFieldString);
             	
  //           	if (subType != null)
-//            	{
- //           		System.out.println("DrawPolygon.createFieldCombo(): subType =  " +
- //           			subType.toString());
- //           	}
+ //          	{
+ //          		System.out.println("DrawPolygon.createFieldCombo(): subType =  " +
+ //          			subType.toString());
+ //          	}
           }
         });
-
+        
+        //select the substitution field
+        
+        fieldTypeCombo.select(selectedFieldIndex);
+        setSubstitutionField();
+       
     }
     
+    private void setSubstitutionField()
+    {
+        String selectedFieldString = fieldTypeCombo.getText();
+        subType = DisplayFieldData.fromDisplayNameString(selectedFieldString);
+        
+    }
     
 
     /**
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/BestEstimate1HrQpeDlg.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/BestEstimate1HrQpeDlg.java
index 09fe9e64aa..d7b4924297 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/BestEstimate1HrQpeDlg.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/BestEstimate1HrQpeDlg.java
@@ -160,7 +160,7 @@ public class BestEstimate1HrQpeDlg extends BasePostAnalysisDlg {
     	    applyGridAdjustments(adjustedGrid, biasRatioGrid, disaggGrid);
 
     	    float[] dataArray = paMgr.convertToSingleArray(adjustedGrid, false, true);
-    	    short[] shortArray= paMgr.convertToShortArray(dataArray, 100.0f);
+    	    short[] shortArray= paMgr.convertToShortArray(dataArray, 1.0f);
 
     	    XmrgFile file = new XmrgFile();  
 
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/PostAnalysisManager.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/PostAnalysisManager.java
index 5226197a40..4d1a797ed5 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/PostAnalysisManager.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/PostAnalysisManager.java
@@ -43,7 +43,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
  * December 2013 DCS 167    C. Gobs     Initial version
- * 
+ * February 2015            C. Gobs     Fixed issue with parsing unexpected file name formats in xmrg directory
  * </pre>
  * 
  * 
@@ -156,6 +156,7 @@ public class PostAnalysisManager
 			try
 			{
 				shiftedDate = utcSdf2.parse(timeString);
+				longTime = shiftedDate.getTime();
 			}
 			catch(ParseException e)
 			{
@@ -164,7 +165,7 @@ public class PostAnalysisManager
 
 		}
 
-		longTime = shiftedDate.getTime();
+		
 
 		return longTime;
 	}