diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/baseTDLSurface.xml b/cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/baseTDLSurface.xml
index 92e6adb6ca..84c955bc1a 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/baseTDLSurface.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.local/localization/menus/local/baseTDLSurface.xml
@@ -28,14 +28,12 @@
 		id="GFSLAMPLine" />
 	<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 		menuText="Station Plot" id="GFSLampStationPlot">
-		<dataURI>/bufrmosLAMP/%</dataURI>
 	    <substitute key="model" value="LAMP"/>
         <substitute key="plotModel" value="bufrmos/gfslamp_stdDesign.svg"/>
 	    <substitute key="title" value="GFSLAMP Station Plot"/>
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 		menuText="Ceil/Vis Station Plot" id="GFSLampCeilVisPlot" >
-		<dataURI>/bufrmosLAMP/%</dataURI>
 	    <substitute key="model" value="LAMP"/>
         <substitute key="plotModel" value="bufrmos/gfslamp_CIGV.svg"/>
 	    <substitute key="title" value="GFSLAMP Ceil/Vis"/>
@@ -45,21 +43,18 @@
 	<contribute xsi:type="subMenu" menuText="GFS" id="GFSMOSMenu">
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 			menuText="Station Plot" id="GFSMOSStationPlot">
-			<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/stdDesign.svg"/>
 	    		<substitute key="title" value="GFS Station Plot"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			 menuText="MaxT/MinT" id="GFSMOSMaxTMinTPlot" >
-				<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/maxmin.svg"/>
 	    		<substitute key="title" value="GFS MaxT/MinT"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			menuText="Ceil/Vis" id="GFSMOSCeilVisPlot">
-				<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/CIGV.svg"/>
 	    		<substitute key="title" value="GFS Ceil/Vis"/>
@@ -67,63 +62,54 @@
 		<contribute xsi:type="subMenu" menuText="Probabilities" id="GFSMOSProbMenu">
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 				menuText="POP 12Hr" id="GFSMOSPop12HrPlot">
-				<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/pqpf12hr.svg"/>
 	    		<substitute key="title" value="GFS POP12Hr"/>
 	    	</contribute>
 	    	<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 	                menuText="POP 6Hr" id="GFSMOSPop6HrPlot">
-	        	<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/pqpf6hr.svg"/>
 	    		<substitute key="title" value="GFS POP6Hr"/>
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Tstorm 12Hr" id="GFSMOSTs12HrPlot">
-	        	<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/tstorm12hr.svg"/>
 	    		<substitute key="title" value="GFS Tstorm 12hr"/>
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Tstorm 6Hr" id="GFSMOSTs6HrPlot">
-	        	<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/tstorm6hr.svg"/>
 	    		<substitute key="title" value="GFS Tstorm 6hr"/>
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Svr Tstorm 12Hr" id="GFSMOSSts12HrPlot">
-	        	<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/severe12hr.svg"/>
 	    		<substitute key="title" value="GFS Svr Tstorm 12hr"/>
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Svr Tstorm 6Hr" id="GFSMOSSts6HrPlot">
-	        	<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/severe6hr.svg"/>
 	    		<substitute key="title" value="GFS Svr Tstorm 6hr"/>
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Cond Rain" id="GFSMOSCondRainPlot">
-	        	<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/precipRain.svg"/>
 	    		<substitute key="title" value="GFS Cond Rain"/>
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Cond Freezing Precip" id="GFSMOSCondFPPlot">
-	        	<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/freezing.svg"/>
 	    		<substitute key="title" value="GFS Cond Freezing"/>
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Cond Snow" id="GFSMOSCondSnowPlot">
-	        	<dataURI>/bufrmosGFS/%</dataURI>
 	        	<substitute key="model" value="GFS"/>
         		<substitute key="plotModel" value="bufrmos/precipSnow.svg"/>
 	    		<substitute key="title" value="GFS Cond Snow"/>
@@ -131,21 +117,18 @@
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			menuText="QPF 12Hr" id="GFSMOSQPF12HrPlot" >
-			<dataURI>/bufrmosGFS/%</dataURI>
 			<substitute key="model" value="GFS"/>
         	<substitute key="plotModel" value="bufrmos/qpf12hr.svg"/>
         	<substitute key="title" value="GFS QPF 12Hr"/>
         </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			menuText="QPF 6Hr" id="GFSMOSQPF6HrPlot" >
-			<dataURI>/bufrmosGFS/%</dataURI>
 			<substitute key="model" value="GFS"/>
         	<substitute key="plotModel" value="bufrmos/qpf6hr.svg"/>
         	<substitute key="title" value="GFS QPF 6Hr"/>
         </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			menuText="SnowFall 24hr" id="GFSMOSSnowFall24HrPlot" >
-			<dataURI>/bufrmosGFS/%</dataURI>
 			<substitute key="model" value="GFS"/>
         	<substitute key="plotModel" value="bufrmos/snowfall24.svg"/>
         	<substitute key="title" value="GFS SnowFall 24hr"/>
@@ -154,14 +137,12 @@
 	<contribute xsi:type="subMenu" menuText="GFS Extended" id="GFSEMOSMenu">
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 			menuText="Station Plot" id="GFSEMOSStationPlot">
-			<dataURI>/bufrmosMRF/%</dataURI>
 	        <substitute key="model" value="MRF"/>
         	<substitute key="plotModel" value="bufrmos/gfsex_stdDesign.svg"/>
 	    	<substitute key="title" value="GFS Extended Station Plot" />
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 			menuText="MaxT/MinT" id="GFSEMOSMaxTMinTPlot">
-			<dataURI>/bufrmosMRF/%</dataURI>
 	        <substitute key="model" value="MRF"/>
         	<substitute key="plotModel" value="bufrmos/gfsex_maxmin.svg"/>
 	    	<substitute key="title" value="GFS Extended MaxT/MinT" />
@@ -169,42 +150,36 @@
 		<contribute xsi:type="subMenu" menuText="Probabilities" id="GFSEMOSProbMenu">
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 				menuText="POP 12Hr" id="GFSEMOSPop12HrPlot">
-				<dataURI>/bufrmosMRF/%</dataURI>
 	        	<substitute key="model" value="MRF"/>
         		<substitute key="plotModel" value="bufrmos/pop12hr.svg"/>
 	    		<substitute key="title" value="GFS Extended POP12Hr" />
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 				menuText="Tstorm 12Hr" id="GFSEEMOSTs12HrPlot">
-				<dataURI>/bufrmosMRF/%</dataURI>
 	        	<substitute key="model" value="MRF"/>
         		<substitute key="plotModel" value="bufrmos/tstorm12hr.svg"/>
 	    		<substitute key="title" value="GFS Extended Tstorm 12Hr" />
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 				menuText="Cond Rain" id="GFSEMOSCondRainPlot">
-				<dataURI>/bufrmosMRF/%</dataURI>
 	        	<substitute key="model" value="MRF"/>
         		<substitute key="plotModel" value="bufrmos/precipRain.svg"/>
 	    		<substitute key="title" value="GFS Extended Cond Rain" />
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 				menuText="Cond Freezing Precip" id="GFSEMOSCondFPPlot">
-				<dataURI>/bufrmosMRF/%</dataURI>
 	        	<substitute key="model" value="MRF"/>
         		<substitute key="plotModel" value="bufrmos/freezing.svg"/>
 	    		<substitute key="title" value="GFS Extended Cond Freezing"/>
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 				menuText="Cond Snow" id="GFSEMOSCondSnowPlot">
-				<dataURI>/bufrmosMRF/%</dataURI>
 	        	<substitute key="model" value="MRF"/>
         		<substitute key="plotModel" value="bufrmos/precipSnow.svg"/>
 	    		<substitute key="title" value="GFS Extended Cond Snow" />
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 				menuText="Cond Mix" id="GFSEMOSCondMixPlot">
-				<dataURI>/bufrmosMRF/%</dataURI>
 	        	<substitute key="model" value="MRF"/>
         		<substitute key="plotModel" value="bufrmos/precipMix.svg"/>
 	    		<substitute key="title" value="GFS Extended Cond Mix" />
@@ -212,7 +187,6 @@
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 			menuText="QPF 12Hr" id="GFSEMOSQPF12HrPlot">
-			<dataURI>/bufrmosMRF/%</dataURI>
 	        <substitute key="model" value="MRF"/>
         	<substitute key="plotModel" value="bufrmos/qpf12hr.svg"/>
 	    	<substitute key="title" value="GFS Extended QPF 12Hr" />
@@ -221,21 +195,18 @@
 	<contribute xsi:type="subMenu" menuText="Eta" id="EtaMOSMenu">
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 		menuText="Station Plot" id="EtaMOSStationPlot" >
-				<dataURI>/bufrmosETA/%</dataURI>
 	        	<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/stdDesign.svg"/>
 	    		<substitute key="title" value="ETA Station Plot"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			 menuText="MaxT/MinT" id="EtaMOSMaxTMinTPlot" >
-			 	<dataURI>/bufrmosETA/%</dataURI>
 	        	<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/maxmin.svg"/>
 	    		<substitute key="title" value="ETA MaxT/MinT"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			menuText="Ceil/Vis" id="EtaMOSCeilVisPlot">
-				<dataURI>/bufrmosETA/%</dataURI>
 	        	<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/CIGV.svg"/>
 	    		<substitute key="title" value="ETA Ceil/Vis"/>
@@ -243,63 +214,54 @@
 		<contribute xsi:type="subMenu" menuText="Probabilities" id="EtaMOSProbMenu">
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml"
 				menuText="POP 12Hr" id="EtaMOSPop12HrPlot">
-				<dataURI>/bufrmosETA/%</dataURI>
 	        	<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/pqpf12hr.svg"/>
         		<substitute key="title" value="ETA POP 12Hr"/>
 	    	</contribute>
 	    	<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 	            menuText="POP 6Hr" id="EtaMOSPop6HrPlot">
-	        	<dataURI>/bufrmosETA/%</dataURI>
 	        	<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/pqpf6hr.svg"/>
         		<substitute key="title" value="ETA POP 6Hr"/>
 	    	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Tstorm 12Hr" id="EtaMOSTs12HrPlot">
-				<dataURI>/bufrmosETA/%</dataURI>
 				<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/tstorm12hr.svg"/>
         		<substitute key="title" value="ETA Tstorm 12hr"/>
         	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Tstorm 6Hr" id="EtaMOSTs6HrPlot">
-				<dataURI>/bufrmosETA/%</dataURI>
 				<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/tstorm6hr.svg"/>
         		<substitute key="title" value="ETA Tstorm 6hr"/>
         	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Svr Tstorm 12Hr" id="EtaMOSSts12HrPlot">
-				<dataURI>/bufrmosETA/%</dataURI>
 				<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/severe12hr.svg"/>
         		<substitute key="title" value="ETA Svr Tstorm 12hr"/>
         	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Svr Tstorm 6Hr" id="EtaMOSSts6HrPlot">
-				<dataURI>/bufrmosETA/%</dataURI>
 				<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/severe6hr.svg"/>
         		<substitute key="title" value="ETA Svr Tstorm 6hr"/>
         	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Cond Rain" id="EtaMOSCondRainPlot">
-				<dataURI>/bufrmosETA/%</dataURI>
 				<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/precipRain.svg"/>
         		<substitute key="title" value="ETA Cond Rain"/>
         	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Cond Freezing Precip" id="EtaMOSCondFPPlot">
-				<dataURI>/bufrmosETA/%</dataURI>
 				<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/freezing.svg"/>
         		<substitute key="title" value="ETA Cond Freezing"/>
         	</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 				menuText="Cond Snow" id="EtaMOSCondSnowPlot">
-				<dataURI>/bufrmosETA/%</dataURI>
 				<substitute key="model" value="ETA"/>
         		<substitute key="plotModel" value="bufrmos/precipSnow.svg"/>
         		<substitute key="title" value="ETA Cond Snow"/>
@@ -307,21 +269,18 @@
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			menuText="QPF 12Hr" id="EtaMOSQPF12HrPlot">
-			<dataURI>/bufrmosETA/%</dataURI>
 			<substitute key="model" value="ETA"/>
         	<substitute key="plotModel" value="bufrmos/qpf12hr.svg"/>
         	<substitute key="title" value="ETA QPF 12Hr"/>
         </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			menuText="QPF 6Hr" id="EtaMOSQPF6HrPlot">
-			<dataURI>/bufrmosETA/%</dataURI>
 			<substitute key="model" value="ETA"/>
         	<substitute key="plotModel" value="bufrmos/qpf6hr.svg"/>
         	<substitute key="title" value="ETA QPF 6Hr"/>
         </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
 			menuText="SnowFall 24hr" id="EtaMOSSnowFall24HrPlot">
-			<dataURI>/bufrmosETA/%</dataURI>
 			<substitute key="model" value="ETA"/>
         	<substitute key="plotModel" value="bufrmos/snowfall24.svg"/>
         	<substitute key="title" value="ETA SnowFall 24hr"/>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAlaskaNPN.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAlaskaNPN.xml
index 0b562b9e9e..3089404b33 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAlaskaNPN.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAlaskaNPN.xml
@@ -22,21 +22,18 @@
 		<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Central AK (CENA2)" id="profCentral_AK"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/70197/%</dataURI>
 	        <substitute key="wmoid" value="70197"/>
         	<substitute key="productURI" value="/profiler/%/3000/70197/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Glennallen AK (GNAA2)" id="profGlennallen_AK"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/70268/%</dataURI>
 	        <substitute key="wmoid" value="70268"/>
         	<substitute key="productURI" value="/profiler/%/3000/70268/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Talkeetna AK (TLKA2)" id="profTalkeetna_AK"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/70252/%</dataURI>
 	        <substitute key="wmoid" value="70252"/>
         	<substitute key="productURI" value="/profiler/%/3000/70252/%"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml
index a6ac6b05ab..fe73bdddad 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml
@@ -23,22 +23,18 @@
 		<contribute xsi:type="titleItem" titleText="------ Convection Products ------" />
 		<contribute xsi:type="bundleItem" file="bundles/ConvSigmet.xml"
 			menuText="Convective SIGMET" id="ConvSigmet">
-			<dataURI>/convsigmet/%</dataURI>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrNcwf.xml" menuText="NCWF" id="NCWF">
-			<dataURI>/bufrncwf/%</dataURI>
 		</contribute>
 		<contribute xsi:type="separator" id="separator1"/>
 		
 		<contribute xsi:type="titleItem" titleText="------ Icing Products ------" />
 		<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml" menuText="SIGMET" id="SIGMETICING">
-			<dataURI>/nonconvsigmet/%</dataURI>
 			<substitute key="hazardType" value="ICING"/>
 			<substitute key="color" value="#FFFFFF"/>
 			<substitute key="name" value="Icing SIGMET"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/Airmet.xml" menuText="AIRMET" id="AIRMETICING">
-			<dataURI>/airmet/%</dataURI>
 			<substitute key="hazardType" value="ICING"/>
 			<substitute key="color" value="#0000FF"/>
 			<substitute key="name" value="Icing AIRMET"/>
@@ -47,13 +43,11 @@
 		
 		<contribute xsi:type="titleItem" titleText="------ Turbulence Products ------" />
 		<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml" menuText="SIGMET" id="SIGMETTURB">
-			<dataURI>/nonconvsigmet/%</dataURI>
 			<substitute key="hazardType" value="TURBULENCE"/>
 			<substitute key="color" value="#FF4444"/>
 			<substitute key="name" value="Turbulence SIGMET"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/Airmet.xml" menuText="AIRMET" id="AIRMETTURB">
-			<dataURI>/airmet/%</dataURI>
 			<substitute key="hazardType" value="TURBULENCE"/>
 			<substitute key="color" value="#00FF00"/>
 			<substitute key="name" value="Turbulence AIRMET"/>
@@ -63,13 +57,11 @@
 		<contribute xsi:type="titleItem" titleText="------ Visibility Products ------" />
 		<contribute xsi:type="subMenu" menuText="AIRMET">
 			<contribute xsi:type="bundleItem" file="bundles/Airmet.xml" menuText="IFR" id="AIRMETIFR">
-				<dataURI>/airmet/%</dataURI>
 				<substitute key="hazardType" value="INSTRUMENT FLIGHT RULES"/>
 				<substitute key="color" value="#00FFFF"/>
 				<substitute key="name" value="IFR AIRMET"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/Airmet.xml" menuText="Mtn Obscn" id="AIRMETMTNOBSC">
-				<dataURI>/airmet/%</dataURI>
 				<substitute key="hazardType" value="MOUNTAIN OBSCURATION"/>
 				<substitute key="color" value="#FF0088"/>
 				<substitute key="name" value="Mtn Obscn AIRMET"/>
@@ -79,7 +71,6 @@
 		
 		<contribute xsi:type="titleItem" titleText="------ Tropical Cyclone ------" />
 		<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml" menuText="SIGMET" id="SIGMETTTOPCYCLONE">
-			<dataURI>/nonconvsigmet/%</dataURI>
 			<substitute key="hazardType" value="TROPICAL CYCLONE"/>
 			<substitute key="color" value="#00FFFF"/>
 			<substitute key="name" value="Tropical Cyclone SIGMET"/>
@@ -88,29 +79,24 @@
 		
 		<contribute xsi:type="titleItem" titleText="------ Volcanic Ash ------" />
 		<contribute xsi:type="bundleItem" file="bundles/NonConvSigmet.xml" menuText="SIGMET" id="SIGMETVOLCANICASH">
-			<dataURI>/nonconvsigmet/%</dataURI>
 			<substitute key="hazardType" value="VOLCANIC ASH CLOUD"/>
 			<substitute key="color" value="#00FF00"/>
 			<substitute key="name" value="Volcanic Ash SIGMET"/>
 		</contribute>
   		<contribute xsi:type="bundleItem" file="bundles/VAA.xml" menuText="Volcanic Ash Advisories" id="VAA">
-			<dataURI>/vaa/%</dataURI>
 		</contribute>
 		<contribute xsi:type="separator" id="separator6"/>
 		
 		<contribute xsi:type="titleItem" titleText="------Center Weather ------" />
 		<contribute xsi:type="bundleItem" file="bundles/CWA.xml" menuText="Center Weather Advisories" id="cwa">
-			<dataURI>/cwa/%</dataURI>
 		</contribute>
 		<contribute xsi:type="separator" id="separator7"/>
 
 		<contribute xsi:type="titleItem" titleText="------Significant Weather------" />
 		<contribute xsi:type="bundleItem" file="bundles/BufrSigWx.xml" menuText="Medium Level" id="SigWxMedium">
-			<dataURI>/bufrsigwx/%/SWM/%</dataURI>
 			<substitute key="wxLayer" value="SWM"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/BufrSigWx.xml" menuText="High Level" id="SigWxHigh">
-			<dataURI>/bufrsigwx/%/SWH/%</dataURI>
 			<substitute key="wxLayer" value="SWH"/>
 		</contribute>
 	</contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseEastNPN.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseEastNPN.xml
index 01d6023e72..1dfd7a51c4 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseEastNPN.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseEastNPN.xml
@@ -22,126 +22,108 @@
 		<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Bloomfield MO (BLMM7)" id="profBloomfield MO"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74662/%</dataURI>
 	        <substitute key="wmoid" value="74662"/>
         	<substitute key="productURI" value="/profiler/%/3000/74662/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Blue River WI (BLRW3)" id="profBlueRiver_WI"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74357/%</dataURI>
 	        <substitute key="wmoid" value="74357"/>
         	<substitute key="productURI" value="/profiler/%/3000/74357/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Conway MO (CNWM7)" id="profConway_MO"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74550/%</dataURI>
 	        <substitute key="wmoid" value="74550"/>
         	<substitute key="productURI" value="/profiler/%/3000/74550/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="DeQueen AR (DQUA4)" id="profDeQueen_AR"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74752/%</dataURI>
 	        <substitute key="wmoid" value="74752"/>
         	<substitute key="productURI" value="/profiler/%/3000/74752/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Fairbury NE (FBYN1)" id="profFairbury_NE"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74440/%</dataURI>
 	        <substitute key="wmoid" value="74440"/>
         	<substitute key="productURI" value="/profiler/%/3000/74440/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Haskell OK (HKL02)" id="profHaskell_OK"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74648/%</dataURI>
 	        <substitute key="wmoid" value="74648"/>
         	<substitute key="productURI" value="/profiler/%/3000/74648/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Lamont OK (LMNO2)" id="profLamont_OK"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74647/%</dataURI>
 	        <substitute key="wmoid" value="74647"/>
         	<substitute key="productURI" value="/profiler/%/3000/74647/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Lathrop MO (LTHM7)" id="profLathrop_MO"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74551/%</dataURI>
 	        <substitute key="wmoid" value="74551"/>
         	<substitute key="productURI" value="/profiler/%/3000/74551/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Ledbetter TX (LDBT2)" id="profLedbetter_TX"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/72246/%</dataURI>
 	        <substitute key="wmoid" value="72246"/>
         	<substitute key="productURI" value="/profiler/%/3000/72246/%"/>
 	    </contribute>
 	   	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Neodesha KS (NDSK1)" id="profNeodesha_KS"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74542/%</dataURI>
 	        <substitute key="wmoid" value="74542"/>
         	<substitute key="productURI" value="/profiler/%/3000/74542/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Okolona MS (OKOM6)" id="profOkolona MS"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74769/%</dataURI>
 	        <substitute key="wmoid" value="74769"/>
         	<substitute key="productURI" value="/profiler/%/3000/74769/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Palestine TX (PATT2)" id="profPalestine_TX"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74750/%</dataURI>
 	        <substitute key="wmoid" value="74750"/>
         	<substitute key="productURI" value="/profiler/%/3000/74750/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Slater IA (SLAI4)" id="profSlater_IA"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74449/%</dataURI>
 	        <substitute key="wmoid" value="74449"/>
         	<substitute key="productURI" value="/profiler/%/3000/74449/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Syracuse NY (SYCN6)" id="profSyracuse_NY"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74379/%</dataURI>
 	        <substitute key="wmoid" value="74379"/>
         	<substitute key="productURI" value="/profiler/%/3000/74379/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Winchester IL (WNCI2)" id="profWinchester_IL"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74556/%</dataURI>
 	        <substitute key="wmoid" value="74556"/>
         	<substitute key="productURI" value="/profiler/%/3000/74556/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Winfield LA (WNFL1)" id="profWinfield_LA"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74753/%</dataURI>
 	        <substitute key="wmoid" value="74753"/>
         	<substitute key="productURI" value="/profiler/%/3000/74753/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Wolcott IN (WLCI3)" id="profWolcott_IN"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74466/%</dataURI>
 	        <substitute key="wmoid" value="74466"/>
         	<substitute key="productURI" value="/profiler/%/3000/74466/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Wood Lake MN (WDLM5)" id="profWoodLake_MN"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74341/%</dataURI>
 	        <substitute key="wmoid" value="74341"/>
         	<substitute key="productURI" value="/profiler/%/3000/74341/%"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseMDCRS.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseMDCRS.xml
index f9be69e2f5..aea7df572f 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseMDCRS.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseMDCRS.xml
@@ -20,97 +20,73 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="000-050hft" id="acars000-050hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="000-050hft" id="acars000-050hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 000-050hft"/>
 	        <substitute key="between" value="0--1524"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="050-100hft" id="acars050-100hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="050-100hft" id="acars050-100hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 050-100hft"/>
 	        <substitute key="between" value="1524--3048"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="100-150hft" id="acars100-150hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="100-150hft" id="acars100-150hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 100-150hft"/>
 	        <substitute key="between" value="3048--4572"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="150-200hft" id="acars150-200hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="150-200hft" id="acars150-200hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 150-200hft"/>
 	        <substitute key="between" value="4572--6096"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="200-250hft" id="acars200-250hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="200-250hft" id="acars200-250hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 200-250hft"/>
 	        <substitute key="between" value="6096--7620"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="250-300hft" id="acars250-300hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="250-300hft" id="acars250-300hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 250-300hft"/>
 	        <substitute key="between" value="7620--9144"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="300-350hft" id="acars300-350hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="300-350hft" id="acars300-350hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 300-350hft"/>
 	        <substitute key="between" value="9144--10668"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="350-400hft" id="acars350-400hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="350-400hft" id="acars350-400hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 350-400hft"/>
 	        <substitute key="between" value="10668--12192"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="400-450hft" id="acars400-450hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="400-450hft" id="acars400-450hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 400-450hft"/>
 	        <substitute key="between" value="12192--13716"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/MDCRSPlot.xml" 
-	                menuText="450-500hft" id="acars450-500hft"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/acars/%</dataURI>
+	                menuText="450-500hft" id="acars450-500hft">
 	        <substitute key="svg" value="acarsPlotDesign.svg"/>
 	        <substitute key="legend" value="MDCRS 450-500hft"/>
 	        <substitute key="between" value="13716--15240"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
-                menuText="1 Hr Prof Avail" id="1hrProfAvail"
-                productInterval="3600" productOffset="1800">
-	        <dataURI>/acarssounding/%</dataURI>
+                menuText="1 Hr Prof Avail" id="1hrProfAvail">
 	        <substitute key="pluginName" value="acarssounding"/>
 	        <substitute key="plotSource" value="MDCRS Profiles 1hr Availability"/>
 	        <substitute key="offset" value="1800"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
-                menuText="6 Hr Prof Avail" id="1hrProfAvail"
-                productInterval="21600" productOffset="10800">
-	        <dataURI>/acarssounding/%</dataURI>
+                menuText="6 Hr Prof Avail" id="1hrProfAvail">
 	        <substitute key="pluginName" value="acarssounding"/>
 	        <substitute key="plotSource" value="MDCRS Profiles 6hr Availability"/>
 	        <substitute key="offset" value="10800"/>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml
index c07c9fb193..6d0ea12fb6 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml
@@ -21,109 +21,79 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<contribute xsi:type="subMenu" menuText="NPN Plot">
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="150hPa" id="npn150hPa"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/profiler/%</dataURI>
+	                menuText="150hPa" id="npn150hPa">
         	<substitute key="level" value="150MB"/>
         	<substitute key="legend" value="150mb Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="200hPa" id="npn200hPa"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/profiler/%</dataURI>
+	                menuText="200hPa" id="npn200hPa">
         	<substitute key="level" value="200MB"/>
         	<substitute key="legend" value="200mb Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="250hPa" id="npn250hPa"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="250hPa" id="npn250hPa">
         	<substitute key="level" value="250MB"/>
         	<substitute key="legend" value="250mb Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="300hPa" id="npn300hPa"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="300hPa" id="npn300hPa">
         	<substitute key="level" value="300MB"/>
         	<substitute key="legend" value="300mb Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="400hPa" id="npn400hPa"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="400hPa" id="npn400hPa">
         	<substitute key="level" value="400MB"/>
         	<substitute key="legend" value="400mb Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="500hPa" id="npn500hPa"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="500hPa" id="npn500hPa">
         	<substitute key="level" value="500MB"/>
         	<substitute key="legend" value="500mb Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="700hPa" id="npn700hPa"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="700hPa" id="npn700hPa">
         	<substitute key="level" value="700MB"/>
         	<substitute key="legend" value="700mb Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="850hPa" id="npn850hPa"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="850hPa" id="npn850hPa">
         	<substitute key="level" value="850MB"/>
         	<substitute key="legend" value="850mb Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="925hPa" id="npn925hPa"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="925hPa" id="npn925hPa">
         	<substitute key="level" value="925MB"/>
         	<substitute key="legend" value="925mb Profiler"/>
 	    </contribute>
 		<contribute xsi:type="separator" id="MySeparatorId"/>	
 
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="1500m AGL" id="npn1500mAGL"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="1500m AGL" id="npn1500mAGL">
         	<substitute key="level" value="1.5kmAgl"/>
         	<substitute key="legend" value="1500m AGL Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="1250m AGL" id="npn1250mAGL"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="1250m AGL" id="npn1250mAGL">
         	<substitute key="level" value="1250mAgl"/>
         	<substitute key="legend" value="1250m AGL Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="1000m AGL" id="npn1000mAGL"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="1000m AGL" id="npn1000mAGL">
         	<substitute key="level" value="1kmAgl"/>
         	<substitute key="legend" value="1000m AGL Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="750m AGL" id="npn750mAGL"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="750m AGL" id="npn750mAGL">
         	<substitute key="level" value="750mAgl"/>
         	<substitute key="legend" value="750m AGL Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="500m AGL" id="npn500mAGL"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="500m AGL" id="npn500mAGL">
         	<substitute key="level" value="0.5kmAgl"/>
         	<substitute key="legend" value="500m AGL Profiler"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/NPNPlot.xml" 
-	                menuText="Surface" id="npnSurface"
-	                productInterval="3600" productOffset="1800">
-        	<dataURI>/profiler/%</dataURI>
+	                menuText="Surface" id="npnSurface">
         	<substitute key="level" value="Surface"/>
         	<substitute key="legend" value="Sfc Profiler"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePirep.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePirep.xml
index ec9f215381..e74a905470 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePirep.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePirep.xml
@@ -20,27 +20,21 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	    <contribute xsi:type="bundleItem" file="bundles/PirepPlot.xml" 
-	                menuText="Low Level" id="lowLevel"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/pirep/%</dataURI>
+	                menuText="Low Level" id="lowLevel">
 	        <substitute key="svg0" value="pirepPlotDesign.svg"/>
 	        <substitute key="svg1" value="pirepPlotDesign.svg"/>
 	        <substitute key="legend" value="PIREP Plot 000-180 hft"/>
 	        <substitute key="between" value="0--18000"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/PirepPlot.xml" 
-	                menuText="Mid Level" id="midLevel"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/pirep/%</dataURI>
+	                menuText="Mid Level" id="midLevel">
 	        <substitute key="svg0" value="pirepPlotDesign.svg"/>
 	        <substitute key="svg1" value="pirepPlotDesign.svg"/>
 	        <substitute key="legend" value="PIREP Plot 180-260 hft"/>
 	        <substitute key="between" value="18000--26000"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/PirepPlot.xml" 
-	                menuText="Hi Level" id="hiLevel"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/pirep/%</dataURI>
+	                menuText="Hi Level" id="hiLevel">
 	        <substitute key="svg0" value="pirepPlotDesign.svg"/>
 	        <substitute key="svg1" value="pirepPlotDesign.svg"/>
 	        <substitute key="legend" value="PIREP Plot 260-500 hft"/>
@@ -49,27 +43,21 @@
 	    <contribute xsi:type="titleItem" 
 				titleText="------ Icing  ------" id="IcingLine"/>
 		<contribute xsi:type="bundleItem" file="bundles/PirepPlot.xml" 
-               menuText="Low Level" id="lowLevel"
-               productInterval="3600" productOffset="1800">
-	        <dataURI>/pirep/%</dataURI>
+               menuText="Low Level" id="lowLevel">
 	        <substitute key="svg0" value="pirepIcingDesign.svg"/>
 	        <substitute key="svg1" value="airepIcingDesign.svg"/>
 	        <substitute key="legend" value="PIREP Icing 000-180 hft"/>
 	        <substitute key="between" value="0--18000"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/PirepPlot.xml" 
-	                menuText="Mid Level" id="midLevel"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/pirep/%</dataURI>
+	                menuText="Mid Level" id="midLevel">
 	        <substitute key="svg0" value="pirepIcingDesign.svg"/>
 	        <substitute key="svg1" value="airepIcingDesign.svg"/>
 	        <substitute key="legend" value="PIREP Icing 180-260 hft"/>
 	        <substitute key="between" value="18000--26000"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/PirepPlot.xml" 
-	                menuText="Hi Level" id="hiLevel"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/pirep/%</dataURI>
+	                menuText="Hi Level" id="hiLevel">
 	        <substitute key="svg0" value="pirepIcingDesign.svg"/>
 	        <substitute key="svg1" value="airepIcingDesign.svg"/>
 	        <substitute key="legend" value="PIREP Icing 260-500 hft"/>
@@ -78,27 +66,21 @@
 		<contribute xsi:type="titleItem" 
 				titleText="------ Turbulence  ------" id="TurbLine"/>
 		<contribute xsi:type="bundleItem" file="bundles/PirepPlot.xml" 
-	                menuText="Low Level" id="lowLevel"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/pirep/%</dataURI>
+	                menuText="Low Level" id="lowLevel">
 	        <substitute key="svg0" value="pirepTurbDesign.svg"/>
 	        <substitute key="svg1" value="airepTurbDesign.svg"/>
 	        <substitute key="legend" value="PIREP Turb 000-180 hft"/>
 	        <substitute key="between" value="0--18000"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/PirepPlot.xml" 
-	                menuText="Mid Level" id="midLevel"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/pirep/%</dataURI>
+	                menuText="Mid Level" id="midLevel">
 	        <substitute key="svg0" value="pirepTurbDesign.svg"/>
 	        <substitute key="svg1" value="airepTurbDesign.svg"/>
 	        <substitute key="legend" value="PIREP Turb 180-260 hft"/>
 	        <substitute key="between" value="18000--26000"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/PirepPlot.xml" 
-	                menuText="Hi Level" id="hiLevel"
-	                productInterval="3600" productOffset="1800">
-	        <dataURI>/pirep/%</dataURI>
+	                menuText="Hi Level" id="hiLevel">
 	        <substitute key="svg0" value="pirepTurbDesign.svg"/>
 	        <substitute key="svg1" value="airepTurbDesign.svg"/>
 	        <substitute key="legend" value="PIREP Turb 260-500 hft"/>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml
index ffcc0e7bbc..6d94615b29 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml
@@ -22,127 +22,106 @@
 	<contribute xsi:type="subMenu" menuText="VWP height-level plots">
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="15km AGL" id="VWP15kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="15kmAgl"/>
 	    	<substitute key="label" value="15km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="14km AGL" id="VWP14kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="14kmAgl"/>
 	    	<substitute key="label" value="14km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="13km AGL" id="VWP13kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="13kmAgl"/>
 	    	<substitute key="label" value="13km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="12km AGL" id="VWP12kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="12kmAgl"/>
 	    	<substitute key="label" value="12km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="11km AGL" id="VWP11kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="11kmAgl"/>
 	    	<substitute key="label" value="11km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="10km AGL" id="VWP10kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="10kmAgl"/>
 	    	<substitute key="label" value="10km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="9km AGL" id="VWP9kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="9kmAgl"/>
 	    	<substitute key="label" value="9km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="8km AGL" id="VWP8kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="8kmAgl"/>
 	    	<substitute key="label" value="8km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="7km AGL" id="VWP7kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="7kmAgl"/>
 	    	<substitute key="label" value="7km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="6km AGL" id="VWP6kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="6kmAgl"/>
 	    	<substitute key="label" value="6km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="5km AGL" id="VWP5kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="5kmAgl"/>
 	    	<substitute key="label" value="5km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="4km AGL" id="VWP4kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="4kmAgl"/>
 	    	<substitute key="label" value="4km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="3km AGL" id="VWP3kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="3kmAgl"/>
 	    	<substitute key="label" value="3km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="2km AGL" id="VWP2kmAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="2kmAgl"/>
 	    	<substitute key="label" value="2km AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="1500m AGL" id="VWP1500mAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="1.5kmAgl"/>
 	    	<substitute key="label" value="1500m AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="1250m AGL" id="VWP1250mAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="1250mAgl"/>
 	    	<substitute key="label" value="1250m AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="1000m AGL" id="VWP1000mAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="1kmAgl"/>
 	    	<substitute key="label" value="1000m AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="750m AGL" id="VWP750mAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="750mAgl"/>
 	    	<substitute key="label" value="750m AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="500m AGL" id="VWP500mAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="0.5kmAgl"/>
 	    	<substitute key="label" value="500m AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="250m AGL" id="VWP250mAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="250mAgl"/>
 	    	<substitute key="label" value="250m AGL"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="100m AGL" id="VWP100mAGL">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="100mAgl"/>
 	    	<substitute key="label" value="100m AGL"/>
 		</contribute>
@@ -150,49 +129,41 @@
 	<contribute xsi:type="subMenu" menuText="VWP pressure-level plots">
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="200hPa" id="VWP200mb">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="200MB"/>
 	    	<substitute key="label" value="200mb"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="250hPa" id="VWP250mb">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="250MB"/>
 	    	<substitute key="label" value="250mb"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="300hPa" id="VWP300mb">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="300MB"/>
 	    	<substitute key="label" value="300mb"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="400hPa" id="VWP400mb">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="400MB"/>
 	    	<substitute key="label" value="400mb"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="500hPa" id="VWP500mb">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="500MB"/>
 	    	<substitute key="label" value="500mb"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="700hPa" id="VWP700mb">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="700MB"/>
 	    	<substitute key="label" value="700mb"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="850hPa" id="VWP850mb">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="850MB"/>
 	    	<substitute key="label" value="850mb"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/VWP.xml"
 			menuText="925hPa" id="VWP925mb">
-			<dataURI>/radar/%/48/%</dataURI>
 	    	<substitute key="levelKey" value="925MB"/>
 	    	<substitute key="label" value="925mb"/>
 		</contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml
index 12b80b04b5..6a947e5eac 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml
@@ -47,67 +47,49 @@
         </contribute>
 		<contribute xsi:type="titleItem" titleText="------ RAOB ------" />
 		<contribute xsi:type="bundleItem" file="bundles/UpperAirPlot.xml" 
-	                menuText="150 hPa" id="150hPa"
-	                productInterval="14400" productOffset="7200">
-	        <dataURI>/bufrua/%/2020/%</dataURI>
+	                menuText="150 hPa" id="150hPa">
         	<substitute key="levelKey" value="150MB"/>
         	<substitute key="plotSource" value="raob 150"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirPlot.xml" 
-	                menuText="200 hPa" id="200hPa"
-	                productInterval="14400" productOffset="7200">
-	        <dataURI>/bufrua/%/2020/%</dataURI>
+	                menuText="200 hPa" id="200hPa">
         	<substitute key="levelKey" value="200MB"/>
         	<substitute key="plotSource" value="raob 200"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirPlot.xml" 
-	                menuText="250 hPa" id="250hPa"
-	                productInterval="14400" productOffset="7200">
-	        <dataURI>/bufrua/%/2020/%</dataURI>
+	                menuText="250 hPa" id="250hPa">
         	<substitute key="levelKey" value="250MB"/>
         	<substitute key="plotSource" value="raob 250"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirPlot.xml" 
-	                menuText="300 hPa" id="300hPa"
-	                productInterval="14400" productOffset="7200">
-	        <dataURI>/bufrua/%/2020/%</dataURI>
+	                menuText="300 hPa" id="300hPa">
         	<substitute key="levelKey" value="300MB"/>
         	<substitute key="plotSource" value="raob 300"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirPlot.xml" 
-	                menuText="400 hPa" id="400hPa"
-	                productInterval="14400" productOffset="7200">
-	        <dataURI>/bufrua/%/2020/%</dataURI>
+	                menuText="400 hPa" id="400hPa">
         	<substitute key="levelKey" value="400MB"/>
         	<substitute key="plotSource" value="raob 400"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirPlot.xml" 
-	                menuText="500 hPa" id="500hPa"
-	                productInterval="14400" productOffset="7200">
-	        <dataURI>/bufrua/%/2020/%</dataURI>
+	                menuText="500 hPa" id="500hPa">
         	<substitute key="levelKey" value="500MB"/>
         	<substitute key="plotSource" value="raob 500"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirPlot.xml" 
-	                menuText="700 hPa" id="700hPa"
-	                productInterval="14400" productOffset="7200">
-	        <dataURI>/bufrua/%/2020/%</dataURI>
+	                menuText="700 hPa" id="700hPa">
         	<substitute key="levelKey" value="700MB"/>
         	<substitute key="plotSource" value="raob 700"/>
         	<substitute key="plotModelFile" value="raobLowerDesign"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirPlot.xml" 
-	                menuText="850 hPa" id="850hPa"
-	                productInterval="14400" productOffset="7200">
-	        <dataURI>/bufrua/%/2020/%</dataURI>
+	                menuText="850 hPa" id="850hPa">
         	<substitute key="levelKey" value="850MB"/>
         	<substitute key="plotSource" value="raob 850"/>
         	<substitute key="plotModelFile" value="raobLowerDesign"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirPlot.xml" 
-	                menuText="925 hPa" id="925hPa"
-	                productInterval="14400" productOffset="7200">
-	        <dataURI>/bufrua/%/2020/%</dataURI>
+	                menuText="925 hPa" id="925hPa">
         	<substitute key="levelKey" value="925MB"/>
         	<substitute key="plotSource" value="raob 925"/>
         	<substitute key="plotModelFile" value="raobLowerDesign"/>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseWestNPN.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseWestNPN.xml
index 02d8615808..36047b77ea 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseWestNPN.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseWestNPN.xml
@@ -22,105 +22,90 @@
 		<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Aztec NM (AZCN5)" id="profAztec_NM"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74630/%</dataURI>
 	        <substitute key="wmoid" value="74630"/>
         	<substitute key="productURI" value="/profiler/%/3000/74630/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Granada CO (GDAC2)" id="profGranada_CO"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74530/%</dataURI>
 	        <substitute key="wmoid" value="74530"/>
         	<substitute key="productURI" value="/profiler/%/3000/74530/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Haviland KS (HVLK1)" id="profHaviland_KS"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74541/%</dataURI>
 	        <substitute key="wmoid" value="74541"/>
         	<substitute key="productURI" value="/profiler/%/3000/74541/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Hillsboro KS (HBRK1)" id="profHillsboro_KS"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74546/%</dataURI>
 	        <substitute key="wmoid" value="74546"/>
         	<substitute key="productURI" value="/profiler/%/3000/74546/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Jayton TX (JTNT2)" id="profJayton_TX"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74735/%</dataURI>
 	        <substitute key="wmoid" value="74735"/>
         	<substitute key="productURI" value="/profiler/%/3000/74735/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="McCook NE (RWDN1)" id="profMcCook_NE"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74433/%</dataURI>
 	        <substitute key="wmoid" value="74433"/>
         	<substitute key="productURI" value="/profiler/%/3000/74433/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Medicine Bow WY (MBWW4)" id="profMedicineBow_WY"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74431/%</dataURI>
 	        <substitute key="wmoid" value="74431"/>
         	<substitute key="productURI" value="/profiler/%/3000/74431/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Merriman NE (MRRN1)" id="profMerriman_NE"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74437/%</dataURI>
 	        <substitute key="wmoid" value="74437"/>
         	<substitute key="productURI" value="/profiler/%/3000/74437/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Neligh NE (NLGN1)" id="profNeligh_NE"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74445/%</dataURI>
 	        <substitute key="wmoid" value="74445"/>
         	<substitute key="productURI" value="/profiler/%/3000/74445/%"/>
 	    </contribute>
 	   	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Platteville CO (PLTC2)" id="profPlatteville_CO"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74533/%</dataURI>
 	        <substitute key="wmoid" value="74533"/>
         	<substitute key="productURI" value="/profiler/%/3000/74533/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Purcell OK (PRCO2)" id="profPurcell_OK"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74649/%</dataURI>
 	        <substitute key="wmoid" value="74649"/>
         	<substitute key="productURI" value="/profiler/%/3000/74649/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Tucumcari NM (TCUN5)" id="profTucumcari_NM"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74731/%</dataURI>
 	        <substitute key="wmoid" value="74731"/>
         	<substitute key="productURI" value="/profiler/%/3000/74731/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Vandenberg CA (VBGC1)" id="profVandenberg_CA"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74604/%</dataURI>
 	        <substitute key="wmoid" value="74604"/>
         	<substitute key="productURI" value="/profiler/%/3000/74604/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="Vici OK (VCIO2)" id="profVici_OK"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74640/%</dataURI>
 	        <substitute key="wmoid" value="74640"/>
         	<substitute key="productURI" value="/profiler/%/3000/74640/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
 	                menuText="White Sands NM (WSMN5)" id="profWhiteSands_NM"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
-	        <dataURI>/profiler/%/3000/74629/%</dataURI>
 	        <substitute key="wmoid" value="74629"/>
         	<substitute key="productURI" value="/profiler/%/3000/74629/%"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/localization/menus/scan/baseScanMenu.xml b/cave/com.raytheon.uf.viz.monitor.scan/localization/menus/scan/baseScanMenu.xml
index dfedb9a9a9..3d1cd28f1c 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/localization/menus/scan/baseScanMenu.xml
+++ b/cave/com.raytheon.uf.viz.monitor.scan/localization/menus/scan/baseScanMenu.xml
@@ -23,14 +23,12 @@
 		id="placeholderSCAN${icao}" />
 	<contribute xsi:type="bundleItem" file="bundles/scan/stormCellsStormThreat.xml"
 			menuText="Storm Cell/ Site Storm Threat" id="SCAN${icao}" commandId="com.raytheon.uf.viz.monitor.scan.openCELLTable">
-			<dataURI>/scan/%/${icao}/CELL/%</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="fieldName" value="CWAT" />
 			<substitute key="type" value="CELL" />
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/scan/stormDMDIconsTable.xml"
 			menuText="DMD Icons And Table" id="SCAN${icao}" commandId="com.raytheon.uf.viz.monitor.scan.openDMDTable">
-			<dataURI>/radar/%/${icao}/DMD/%</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="type" value="DMD" />
 	</contribute>
@@ -39,38 +37,32 @@
 		<contribute xsi:type="separator" id="${icao}belowQPF" />
 		<contribute xsi:type="bundleItem" file="bundles/scan/QPF.xml"
 			menuText="QPF .10" id="${icao}QPF .10">
-			<dataURI>/qpf/%/${icao}/P10</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="fieldName" value="P10" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/scan/QPF.xml"
 			menuText="QPF .25" id="${icao}QPF .25">
-			<dataURI>/qpf/%/${icao}/P25</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="fieldName" value="P25" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/scan/QPF.xml"
 			menuText="QPF .50" id="${icao}QPF .50">
-			<dataURI>/qpf/%/${icao}/P50</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="fieldName" value="P50" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/scan/QPF.xml"
 			menuText="QPF .75" id="${icao}QPF .75">
-			<dataURI>/qpf/%/${icao}/P75</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="fieldName" value="P75" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/scan/QPF.xml"
 			menuText="QPF 1hr categorical rain fcst." id="${icao}QPF 1hr categorical rain fcst.">
-			<dataURI>/qpf/%/${icao}/PRECIP_AMT</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="fieldName" value="PRECIP_AMT" />
 		</contribute>
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/scan/scanCWAThreatIndex.xml"
 		menuText="SCAN CWA Threat Index" id="${icao}SCAN CWA Threat Index">
-		<dataURI>/cwat/%/${icao}/CWAT</dataURI>
 		<substitute key="icao" value="${icao}" />
 		<substitute key="fieldName" value="CWAT" />
 		<substitute key="colormap" value="scan/SCANCWAThreatIndex" />
@@ -80,21 +72,18 @@
 		<contribute xsi:type="separator" id="${icao}belowHail" />
 		<contribute xsi:type="bundleItem" file="bundles/scan/VIL.xml"
 			menuText="VIL Density" id="${icao}VILDensity">
-			<dataURI>/vil/%/${icao}/VILD</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="fieldName" value="VILD" />
 			<substitute key="colormap" value="scan/VILDensity" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/scan/VIL.xml"
 			menuText="Digital VIL Density" id="${icao}DigitalVILDensity">
-			<dataURI>/vil/%/${icao}/DVILD</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="fieldName" value="DVILD" />
 			<substitute key="colormap" value="scan/VILDensity" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/scan/VIL.xml"
 			menuText="Enhanced Digital VIL Density" id="${icao}EnhancedDigitalVILDensity">
-			<dataURI>/vil/%/${icao}/EDVILD</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="fieldName" value="EDVILD" />
 			<substitute key="colormap" value="scan/VILDensity" />
@@ -102,7 +91,6 @@
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/scan/PrecipRate.xml"
 		menuText="Precipitation Rate (in/hr)" id="${icao}PrecipitationRate">
-		<dataURI>/preciprate/%/${icao}</dataURI>
 		<substitute key="icao" value="${icao}" />
 		<substitute key="colormap" value="scan/DHR" />
 	</contribute>
diff --git a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHydroQPE.xml b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHydroQPE.xml
index aa8f3bfdd7..52bb00b217 100644
--- a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHydroQPE.xml
+++ b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHydroQPE.xml
@@ -48,68 +48,55 @@
 	
 	<contribute xsi:type="bundleItem" file="bundles/hydro/AutoSPE.xml"
 		menuText="1hr Auto SPE" id="AutoSPE">
-		<dataURI>/grib/%/AUTOSPE/%</dataURI>
 	    <substitute key="model" value="SPE"/>
 	</contribute>
 	<contribute xsi:type="subMenu" menuText="Manual SPE" id="MSPEMenu">
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="1hr Manual SPE" id="1ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="3600"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="2hr Manual SPE" id="2ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="7200"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="3hr Manual SPE" id="3ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="10800"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="4hr Manual SPE" id="4ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="14400"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="5hr Manual SPE" id="5ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="18000"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="6hr Manual SPE" id="6ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="21600"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="7hr Manual SPE" id="7ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="25200"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="8hr Manual SPE" id="8ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="28800"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="9hr Manual SPE" id="9ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="32400"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="10hr Manual SPE" id="10ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="36000"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="11hr Manual SPE" id="11ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="39600"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/hydro/ManSPE.xml"
 			menuText="12hr Manual SPE" id="12ManSPE">
-			<dataURI>/grib/%/MANSPE/%</dataURI>
 	    	<substitute key="fcsttime" value="43200"/>
 		</contribute>
     </contribute>
diff --git a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml
index af67408d8a..7e2d410b54 100644
--- a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml
+++ b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml
@@ -21,21 +21,18 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGLmosaic.xml"
 		menuText="1hr FFG Mosaic" id="1hrFFG">
-		<dataURI>/grib/%/FFG0124hr/%</dataURI>
 		<substitute key="timespan" value="FFG0124hr"/>
 	    <substitute key="type" value="FFG-"/>
 	    <substitute key="name" value="RFC 1hr FFG Mosaic"/>
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGLmosaic.xml"
 		menuText="3hr FFG Mosaic" id="3hrFFG">
-		<dataURI>/grib/%/FFG0324hr/%</dataURI>
 		<substitute key="timespan" value="FFG0324hr"/>
 	    <substitute key="type" value="FFG-"/>
 	    <substitute key="name" value="RFC 3hr FFG Mosaic"/>
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGLmosaic.xml"
 		menuText="6hr FFG Mosaic" id="6hrFFG">
-		<dataURI>/grib/%/FFG0624hr/%</dataURI>
 		<substitute key="timespan" value="FFG0624hr"/>
 	    <substitute key="type" value="FFG-"/>
 	    <substitute key="name" value="RFC 6hr FFG Mosaic"/>
@@ -44,19 +41,16 @@
 		<contribute xsi:type="subMenu" menuText="ABRFC" id="ABRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="AB1hrFFG">
-				<dataURI>/grib/%/FFG-TUA/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-TUA"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="AB3hrFFG">
-				<dataURI>/grib/%/FFG-TUA/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-TUA"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="AB6hrFFG">
-				<dataURI>/grib/%/FFG-TUA/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-TUA"/>
 			</contribute>
@@ -64,19 +58,16 @@
 		<contribute xsi:type="subMenu" menuText="AKRFC" id="AKRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="AK1hrFFG">
-				<dataURI>/grib/%/FFG-ACR/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-ACR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="AK3hrFFG">
-				<dataURI>/grib/%/FFG-ACR/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-ACR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="AK6hrFFG">
-				<dataURI>/grib/%/FFG-ACR/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-ACR"/>
 			</contribute>
@@ -84,19 +75,16 @@
 		<contribute xsi:type="subMenu" menuText="CBRFC" id="CBRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="CB1hrFFG">
-				<dataURI>/grib/%/FFG-STR/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-STR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="CB3hrFFG">
-				<dataURI>/grib/%/FFG-STR/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-STR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="CB6hrFFG">
-				<dataURI>/grib/%/FFG-STR/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-STR"/>
 			</contribute>
@@ -104,19 +92,16 @@
 		<contribute xsi:type="subMenu" menuText="CNRFC" id="CNRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="CN1hrFFG">
-				<dataURI>/grib/%/FFG-RSA/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-RSA"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="CN3hrFFG">
-				<dataURI>/grib/%/FFG-RSA/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-RSA"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="CN6hrFFG">
-				<dataURI>/grib/%/FFG-RSA/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-RSA"/>
 			</contribute>
@@ -124,19 +109,16 @@
 		<contribute xsi:type="subMenu" menuText="LMRFC" id="LMRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="LM1hrFFG">
-				<dataURI>/grib/%/FFG-ORN/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-ORN"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="LM3hrFFG">
-				<dataURI>/grib/%/FFG-ORN/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-ORN"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="LM6hrFFG">
-				<dataURI>/grib/%/FFG-ORN/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-ORN"/>
 			</contribute>
@@ -144,19 +126,16 @@
 		<contribute xsi:type="subMenu" menuText="MARFC" id="MARFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="MA1hrFFG">
-				<dataURI>/grib/%/FFG-RHA/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-RHA"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="MA3hrFFG">
-				<dataURI>/grib/%/FFG-RHA/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-RHA"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="MA6hrFFG">
-				<dataURI>/grib/%/FFG-RHA/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-RHA"/>
 			</contribute>
@@ -164,19 +143,16 @@
 		<contribute xsi:type="subMenu" menuText="MBRFC" id="MBRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="MB1hrFFG">
-				<dataURI>/grib/%/FFG-KRF/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-KRF"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="MB3hrFFG">
-				<dataURI>/grib/%/FFG-KRF/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-KRF"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="MB6hrFFG">
-				<dataURI>/grib/%/FFG-KRF/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-KRF"/>
 			</contribute>
@@ -184,19 +160,16 @@
 		<contribute xsi:type="subMenu" menuText="NCRFC" id="NCRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="NC1hrFFG">
-				<dataURI>/grib/%/FFG-MSR/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-MSR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="NC3hrFFG">
-				<dataURI>/grib/%/FFG-MSR/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-MSR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="NC6hrFFG">
-				<dataURI>/grib/%/FFG-MSR/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-MSR"/>
 			</contribute>
@@ -204,19 +177,16 @@
 		<contribute xsi:type="subMenu" menuText="NERFC" id="NERFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="NE1hrFFG">
-				<dataURI>/grib/%/FFG-TAR/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-TAR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="NE3hrFFG">
-				<dataURI>/grib/%/FFG-TAR/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-TAR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="NE6hrFFG">
-				<dataURI>/grib/%/FFG-TAR/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-TAR"/>
 			</contribute>
@@ -224,19 +194,16 @@
 		<contribute xsi:type="subMenu" menuText="NWRFC" id="NWRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="NW1hrFFG">
-				<dataURI>/grib/%/FFG-PTR/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-PTR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="NW3hrFFG">
-				<dataURI>/grib/%/FFG-PTR/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-PTR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="NW6hrFFG">
-				<dataURI>/grib/%/FFG-PTR/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-PTR"/>
 			</contribute>
@@ -244,19 +211,16 @@
 		<contribute xsi:type="subMenu" menuText="OHRFC" id="OHRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="OH1hrFFG">
-				<dataURI>/grib/%/FFG-TIR/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-TIR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="OH3hrFFG">
-				<dataURI>/grib/%/FFG-TIR/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-TIR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="OH6hrFFG">
-				<dataURI>/grib/%/FFG-TIR/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-TIR"/>
 			</contribute>
@@ -264,19 +228,16 @@
 		<contribute xsi:type="subMenu" menuText="SERFC" id="SERFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="SE1hrFFG">
-				<dataURI>/grib/%/FFG-ALR/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-ALR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="SE3hrFFG">
-				<dataURI>/grib/%/FFG-ALR/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-ALR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="SE6hrFFG">
-				<dataURI>/grib/%/FFG-ALR/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-ALR"/>
 			</contribute>
@@ -284,19 +245,16 @@
 		<contribute xsi:type="subMenu" menuText="WGRFC" id="WGRFCMenu">
 		  	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 		  		menuText="1hr FFG" id="WG1hrFFG">
-				<dataURI>/grib/%/FFG-FWR/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
 				<substitute key="model" value="FFG-FWR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="WG3hrFFG">
-				<dataURI>/grib/%/FFG-FWR/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
 	    		<substitute key="model" value="FFG-FWR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="WG6hrFFG">
-				<dataURI>/grib/%/FFG-FWR/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
 	    		<substitute key="model" value="FFG-FWR"/>
 			</contribute>
diff --git a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml
index 0a0fa34f24..29451efc45 100644
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml
@@ -20,46 +20,38 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <contribute xsi:type="bundleItem" file="bundles/maritimeFixedBuoy.xml" 
-			menuText="Fixed Buoys" id="FixedBuoys" 
-			productInterval="3600" productOffset="1800" />
+			menuText="Fixed Buoys" id="FixedBuoys"/>
     <contribute xsi:type="bundleItem" file="bundles/maritimeMoving.xml" 
-			menuText="Moving Maritime" id="MovingMaritime" 
-			productInterval="3600" productOffset="1800" />
+			menuText="Moving Maritime" id="MovingMaritime"/>
     <contribute xsi:type="bundleItem" file="bundles/maritimeMAROB.xml" 
-			menuText="MAROB" id="MAROB" 
-			productInterval="3600" productOffset="1800" />
+			menuText="MAROB" id="MAROB"/>
 	<contribute xsi:type="subMenu" menuText="Other Maritime Plots">
 		<contribute xsi:type="bundleItem" file="bundles/SeaStatePlot.xml" 
-               menuText="Fixed Sea State" id="FixedSeaState"
-               productInterval="3600" productOffset="1800">
+               menuText="Fixed Sea State" id="FixedSeaState">
 	        <substitute key="svg" value="seaStateDesign.svg"/>
 	        <substitute key="legend" value="Fixed Buoys Sea State"/>
 	        <substitute key="reportType" value="1004,1005"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SeaStatePlot.xml" 
-               menuText="Moving Sea State" id="MovingSeaState"
-               productInterval="3600" productOffset="1800">
+               menuText="Moving Sea State" id="MovingSeaState">
 	        <substitute key="svg" value="seaStateDesign.svg"/>
 	        <substitute key="legend" value="Moving Buoys/Ships Sea State"/>
 	        <substitute key="reportType" value="1003,1006"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SeaStatePlot.xml" 
-               menuText="MAROB Sea State" id="MAROBSeaState"
-               productInterval="3600" productOffset="1800">
+               menuText="MAROB Sea State" id="MAROBSeaState">
 	        <substitute key="svg" value="seaStateDesign.svg"/>
 	        <substitute key="legend" value="MAROB Sea State"/>
 	        <substitute key="reportType" value="1007"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/MaritimePlot.xml" 
-               menuText="Maritime Clouds/Vis" id="MaritimeCloudVis"
-               productInterval="3600" productOffset="1800">
+               menuText="Maritime Clouds/Vis" id="MaritimeCloudVis">
 	        <substitute key="svg" value="maritimeCvDesign.svg"/>
 	        <substitute key="legend" value="Maritime Clouds and Visibility"/>
 	        <substitute key="reportType" value="1003"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/MaritimePlot.xml" 
-               menuText="MAROB Clouds/Vis" id="MarobCloudsVis"
-               productInterval="3600" productOffset="1800">
+               menuText="MAROB Clouds/Vis" id="MarobCloudsVis">
 	        <substitute key="svg" value="maritimeCvDesign.svg"/>
 	        <substitute key="legend" value="MAROB Clouds and Visibility"/>
 	        <substitute key="reportType" value="1007"/>
@@ -67,9 +59,7 @@
 		<contribute xsi:type="subMenu" menuText="Scatterometer Winds">
 			<!-- 
 			<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml" 
-	               menuText="QuikSCAT Winds 12.5 km" id="QuikSCAT"
-	               productInterval="3600" productOffset="1800">
-		        <dataURI>/bufrquikscat/%</dataURI>
+	               menuText="QuikSCAT Winds 12.5 km" id="QuikSCAT">
 		        <substitute key="legend" value="QUIKSCAT"/>
 		        <substitute key="svg" value="quikScatPlotDesign.svg"/>
 		        <substitute key="plugin" value="bufrquikscat"/>
@@ -78,8 +68,7 @@
 		    </contribute>
 		    -->
 		    <contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml" 
-	               menuText="ASCAT Winds 25 km" id="ASCATWinds"
-	               productInterval="3600" productOffset="1800">
+	               menuText="ASCAT Winds 25 km" id="ASCATWinds">
 		        <substitute key="legend" value="ASCAT"/>
 		        <substitute key="svg" value="ascatPlotDesign.svg"/>
 		        <substitute key="plugin" value="bufrascat"/>
diff --git a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml
index 2217128a8f..13fca80d4d 100644
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml
@@ -20,8 +20,7 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<contribute xsi:type="bundleItem" file="bundles/StationPlot.xml"
-			menuText="Station Plot" id="StationPlot">
-			<dataURI>/obs/%</dataURI>		
+			menuText="Station Plot" id="StationPlot">		
     </contribute> 
 	<contribute xsi:type="subMenu" menuText="Other Plots">
 		<contribute xsi:type="bundleItem" file="bundles/15minSurfacePlot.xml"
diff --git a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml
index 2642d7b0a9..95311e38ff 100644
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml
@@ -28,16 +28,14 @@
 	</contribute>
 	<contribute xsi:type="subMenu" menuText="Other Synoptic Plots">
 		<contribute xsi:type="bundleItem" file="bundles/SynSurfacePlot.xml" 
-				menuText="6 hr Precip" id="synoptic6hrPrecip" 
-				productInterval="3600" productOffset="1800">
+				menuText="6 hr Precip" id="synoptic6hrPrecip">
 			<substitute key="svg" value="synopticPrcp6Design.svg"/>
 			<substitute key="legend" value="Synoptic 6hr Precip Plot"/>
 			<substitute key="posOffset" value="0"/>
 		    <substitute key="negOffset" value="21600"/> 
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SynSurfacePlot.xml" 
-				menuText="24 hr Precip" id="synoptic24hrPrecip" 
-				productInterval="3600" productOffset="1800">
+				menuText="24 hr Precip" id="synoptic24hrPrecip">
 			<substitute key="svg" value="synopticPrcp24Design.svg"/>
 			<substitute key="legend" value="Synoptic 24hr Precip Plot"/>
 			<substitute key="posOffset" value="0"/>
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseDualPolProds.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseDualPolProds.xml
index 37f525a81a..10fd145a18 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseDualPolProds.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseDualPolProds.xml
@@ -1113,7 +1113,6 @@
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadarLayered.xml"
 			menuText="User 6hr Accum" id="${icao}User6hrAccum">
-			<dataURI>/radar/%/${icao}/173/%</dataURI>
 	        <substitute key="icao" value="${icao}"/>
 	        <substitute key="product" value="173"/>
 			<substitute key="layer" value="4.0"/>
@@ -1407,7 +1406,6 @@
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 					menuText="6.0 Spec Diff" id="${icao}604bitSpecDiff">
-				<dataURI>/radar/%/${icao}/162/6.0</dataURI>
 		       	<substitute key="icao" value="${icao}"/>
 		       	<substitute key="product" value="162"/>
 				<substitute key="elevation" value="6.0--6.0"/>
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarDerived.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarDerived.xml
index de89057bde..f837fa3073 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarDerived.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarDerived.xml
@@ -29,7 +29,6 @@
 	    </contribute>	
 	<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml" 
 				menuText="User Sel Lyr Ref (ULR)" id="${icao}UserSelLyrRefULR">
-			<dataURI>/radar/%/${icao}/137/%</dataURI>
 	        <substitute key="product" value="137"/>
 	        <substitute key="elevation" value="0.0--0.0"/>
 	    </contribute>	
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
index e421d33b5d..9a5de08eb9 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
@@ -9,7 +9,6 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<contribute xsi:type="bundleItem" file="bundles/DefaultRadarCodedMessage.xml"
 		menuText="10km Radar Coded Msg" id="10kmRadarCodedMsg">
-		<dataURI>/grib/%/301</dataURI>
 	</contribute>
 	<contribute xsi:type="subinclude" fileName="menus/radar/airportRadars.xml" />
 	<contribute xsi:type="titleItem" titleText="------ Mosaic ------"
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseTerminalStormProducts.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseTerminalStormProducts.xml
index 769a060e16..ae7f3af216 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseTerminalStormProducts.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseTerminalStormProducts.xml
@@ -29,7 +29,6 @@
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="Echo Tops (ET)" id="${icao}TerminalEchoTopET">
-			<dataURI>/radar/%/${icao}/41/0.0</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="product" value="41" />
 			<substitute key="elevation" value="0.0--0.0" />
@@ -37,21 +36,18 @@
 		<contribute xsi:type="separator" id="${icao}BelowTerminalEchoTopsET" />
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="Storm Track (STI)" id="${icao}TerminalStormTrackSTI">
-			<dataURI>/radar/%/${icao}/58/0.0</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="product" value="58" />
 			<substitute key="elevation" value="0.0--0.0" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="Hail Index (HI)" id="${icao}TerminalHailIndexHI">
-			<dataURI>/radar/%/${icao}/59/0.0</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="product" value="59" />
 			<substitute key="elevation" value="0.0--0.0" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="Tornado Vortex Sig (TVS)" id="${icao}TerminalTornadoVortexSigTVS">
-			<dataURI>/radar/%/${icao}/61/0.0</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="product" value="61" />
 			<substitute key="elevation" value="0.0--0.0" />
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarDerivedProducts.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarDerivedProducts.xml
index c508ddc51a..d2c455e0e4 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarDerivedProducts.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarDerivedProducts.xml
@@ -269,7 +269,6 @@
 			id="${icao}LayerMaxZ" />
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="User Sel Lyr Ref (ULR)" id="${icao}UserSelLyrRefULR">
-			<dataURI>/radar/%/${icao}/137/%</dataURI>
 	        <substitute key="product" value="137"/>
 	        <substitute key="elevation" value="0.0--0.0"/>
 	    </contribute>	
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarPrecip.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarPrecip.xml
index 8a5047e739..7cedec9b32 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarPrecip.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarPrecip.xml
@@ -117,7 +117,6 @@
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadarLayered.xml"
 			menuText="User 6hr Accum" id="${icao}User6hrAccum">
-			<dataURI>/radar/%/${icao}/173/%</dataURI>
 	        <substitute key="icao" value="${icao}"/>
 	        <substitute key="product" value="173"/>
 			<substitute key="layer" value="4.0"/>
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalAlgorithmOverlays.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalAlgorithmOverlays.xml
index a37135632d..3e4074154d 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalAlgorithmOverlays.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalAlgorithmOverlays.xml
@@ -23,21 +23,18 @@
 		id="${icao}TerminalAlgorithmOverlays">
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="Storm Track (STI)" id="${icao}TerminalStormTrackSTI">
-			<dataURI>/radar/%/${icao}/58/0.0</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="product" value="58" />
 			<substitute key="elevation" value="0.0--0.0" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="Hail Index (HI)" id="${icao}TerminalHailIndexHI">
-			<dataURI>/radar/%/${icao}/59/0.0</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="product" value="59" />
 			<substitute key="elevation" value="0.0--0.0" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="Tornado Vortex Sig (TVS)" id="${icao}TerminalTornadoVortexSigTVS">
-			<dataURI>/radar/%/${icao}/61/0.0</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="product" value="61" />
 			<substitute key="elevation" value="0.0--0.0" />
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalDerivedProducts.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalDerivedProducts.xml
index 77e6b12de1..0e586ea5b5 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalDerivedProducts.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalDerivedProducts.xml
@@ -37,7 +37,6 @@
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="Echo Tops (ET)" id="${icao}TerminalEchoTopET">
-			<dataURI>/radar/%/${icao}/41/0.0</dataURI>
 			<substitute key="icao" value="${icao}" />
 			<substitute key="product" value="41" />
 			<substitute key="elevation" value="0.0--0.0" />
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/klgx/baseRadarDerivedProducts.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/klgx/baseRadarDerivedProducts.xml
index 1a58c86847..30fe0005ca 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/klgx/baseRadarDerivedProducts.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/klgx/baseRadarDerivedProducts.xml
@@ -279,7 +279,6 @@
 			id="${icao}LayerMaxZ" />
 		<contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
 			menuText="User Sel Lyr Ref (ULR)" id="${icao}UserSelLyrRefULR">
-			<dataURI>/radar/%/${icao}/137/%</dataURI>
 	        <substitute key="product" value="137"/>
 	        <substitute key="elevation" value="0.0--0.0"/>
 	    </contribute>	
diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
index 5295b6aeeb..36e5a55bce 100644
--- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
+++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
@@ -23,43 +23,38 @@
 		<contribute xsi:type="titleItem"
 			titleText="------ Satellite-Derived Winds  ------" id="SatDerivedWindLine" />
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
-			menuText="IR Plot" id="irPlot" productInterval="3600" productOffset="1800">
+			menuText="IR Plot" id="irPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="satType" value="IR" />
 			<substitute key="legend" value="IR" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
-			menuText="Water Vapor Plot" id="waterVaporPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="Water Vapor Plot" id="waterVaporPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="satType" value="WV" />
 			<substitute key="legend" value="Water Vapor" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
-			menuText="Visible Plot" id="visiblePlot" productInterval="3600"
-			productOffset="1800">
+			menuText="Visible Plot" id="visiblePlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="satType" value="Vis" />
 			<substitute key="legend" value="Visible" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/Satellite3_9WindPlots.xml"
-			menuText="IR 3.9u Plot" id="ir3.9uPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="IR 3.9u Plot" id="ir3.9uPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteWV7_0WindPlots.xml"
-			menuText="Water Vapor 7.0u Plot" id="waterVapor7.0uPlot"
-			productInterval="3600" productOffset="1800">
+			menuText="Water Vapor 7.0u Plot" id="waterVapor7.0uPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteWV7_4WindPlots.xml"
-			menuText="Water Vapor 7.4u Plot" id="waterVapor7.4uPlot"
-			productInterval="3600" productOffset="1800">
+			menuText="Water Vapor 7.4u Plot" id="waterVapor7.4uPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 		</contribute>
@@ -67,64 +62,56 @@
 		<contribute xsi:type="titleItem"
 			titleText="------ Satellite Layer Winds  ------" id="SatLayerdWindLine" />
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="200hPa Layer Plot" id="200hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="200hPa Layer Plot" id="200hPaLayerPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="legend" value="225mb-100mb" />
 			<substitute key="between" value="10000--22600" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="250hPa Layer Plot" id="250hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="250hPa Layer Plot" id="250hPaLayerPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="legend" value="275mb-225mb" />
 			<substitute key="between" value="22600--27500" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="300hPa Layer Plot" id="300hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="300hPa Layer Plot" id="300hPaLayerPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="legend" value="350mb-275mb" />
 			<substitute key="between" value="27600--35000" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="400hPa Layer Plot" id="400hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="400hPa Layer Plot" id="400hPaLayerPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="legend" value="450mb-350mb" />
 			<substitute key="between" value="35100--45000" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="500hPa Layer Plot" id="500hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="500hPa Layer Plot" id="500hPaLayerPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="legend" value="600mb-450mb" />
 			<substitute key="between" value="45100--60000" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="700hPa Layer Plot" id="700hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="700hPa Layer Plot" id="700hPaLayerPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="legend" value="775mb-600mb" />
 			<substitute key="between" value="60100--77500" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="850hPa Layer Plot" id="850hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="850hPa Layer Plot" id="850hPaLayerPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="legend" value="900mb-775mb" />
 			<substitute key="between" value="77600--90000" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="925hPa Layer Plot" id="925hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="925hPa Layer Plot" id="925hPaLayerPlot">
 			<substitute key="pluginName" value="bufrhdw" />
 			<substitute key="source" value="GOES"/>
 			<substitute key="legend" value="1050mb-900mb" />
@@ -135,31 +122,28 @@
 		<contribute xsi:type="titleItem"
 			titleText="------ Satellite-Derived Winds  ------" id="SatDerivedWindLine" />
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
-			menuText="IR Plot" id="irPlot" productInterval="3600" productOffset="1800">
+			menuText="IR Plot" id="irPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="satType" value="IR" />
 			<substitute key="legend" value="IR" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
-			menuText="Water Vapor Plot" id="waterVaporPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="Water Vapor Plot" id="waterVaporPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="satType" value="WV" />
 			<substitute key="legend" value="Water Vapor" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
-			menuText="Visible Plot" id="visiblePlot" productInterval="3600"
-			productOffset="1800">
+			menuText="Visible Plot" id="visiblePlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="satType" value="Vis" />
 			<substitute key="legend" value="Visible" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/Satellite3_9WindPlots.xml"
-			menuText="IR 3.9u Plot" id="ir3.9uPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="IR 3.9u Plot" id="ir3.9uPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 		</contribute>
@@ -167,64 +151,56 @@
 		<contribute xsi:type="titleItem"
 			titleText="------ Satellite Layer Winds  ------" id="SatLayerdWindLine" />
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="200hPa Layer Plot" id="200hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="200hPa Layer Plot" id="200hPaLayerPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="legend" value="225mb-100mb" />
 			<substitute key="between" value="10000--22600" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="250hPa Layer Plot" id="250hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="250hPa Layer Plot" id="250hPaLayerPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="legend" value="275mb-225mb" />
 			<substitute key="between" value="22600--27500" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="300hPa Layer Plot" id="300hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="300hPa Layer Plot" id="300hPaLayerPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="legend" value="350mb-275mb" />
 			<substitute key="between" value="27600--35000" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="400hPa Layer Plot" id="400hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="400hPa Layer Plot" id="400hPaLayerPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="legend" value="450mb-350mb" />
 			<substitute key="between" value="35100--45000" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="500hPa Layer Plot" id="500hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="500hPa Layer Plot" id="500hPaLayerPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="legend" value="600mb-450mb" />
 			<substitute key="between" value="45100--60000" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="700hPa Layer Plot" id="700hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="700hPa Layer Plot" id="700hPaLayerPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="legend" value="775mb-600mb" />
 			<substitute key="between" value="60100--77500" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="850hPa Layer Plot" id="850hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="850hPa Layer Plot" id="850hPaLayerPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="legend" value="900mb-775mb" />
 			<substitute key="between" value="77600--90000" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
-			menuText="925hPa Layer Plot" id="925hPaLayerPlot" productInterval="3600"
-			productOffset="1800">
+			menuText="925hPa Layer Plot" id="925hPaLayerPlot">
 			<substitute key="pluginName" value="bufrmthdw" />
 			<substitute key="source" value="MTSAT"/>
 			<substitute key="legend" value="1050mb-900mb" />
@@ -234,9 +210,7 @@
 	<contribute xsi:type="subMenu" menuText="Scatterometer Winds">
 		<!--
 		<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml"
-			menuText="QuikSCAT 12.5 km" id="QuikSCAT" productInterval="3600"
-			productOffset="1800">
-			<dataURI>/bufrquikscat/%</dataURI>
+			menuText="QuikSCAT 12.5 km" id="QuikSCAT">
 	        <substitute key="legend" value="QUIKSCAT"/>
 	        <substitute key="svg" value="quikScatPlotDesign.svg"/>
 	        <substitute key="plugin" value="bufrquikscat"/>
@@ -245,9 +219,7 @@
 	    </contribute>
 	    -->
 	    <contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml" 
-               menuText="ASCAT Winds 25 km" id="ASCATWinds"
-               productInterval="3600" productOffset="1800">
-	        <dataURI>/bufrascat/%</dataURI>
+               menuText="ASCAT Winds 25 km" id="ASCATWinds">
 	        <substitute key="legend" value="ASCAT"/>
 	        <substitute key="svg" value="ascatPlotDesign.svg"/>
 	        <substitute key="plugin" value="bufrascat"/>
@@ -259,42 +231,36 @@
 		<contribute xsi:type="titleItem" 
 				titleText="------ SSM/I Data ------" id="SSMIDataLine"/>
 		<contribute xsi:type="bundleItem" file="bundles/SSMIWindPlot.xml" 
-               menuText="SSM/I Wind Speeds" id="SSMIDataLine"
-               productInterval="3600" productOffset="1800">
+               menuText="SSM/I Wind Speeds" id="SSMIDataLine">
 	        <substitute key="svg" value="ssmiWindPlotDesign.svg"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml" 
-               menuText="SSM/I Precip. Water" id="SSMIDataLine"
-               productInterval="3600" productOffset="1800">
+               menuText="SSM/I Precip. Water" id="SSMIDataLine">
 	        <substitute key="svg" value="ssmiPWPlotDesign.svg"/>
 	        <substitute key="legend" value="SSM/I Precipitable Water (kg/m**2)"/>
 	        <substitute key="offset" value="1800"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml" 
-               menuText="SSM/I Sea Temperature" id="SSMIDataLine"
-               productInterval="3600" productOffset="1800">
+               menuText="SSM/I Sea Temperature" id="SSMIDataLine">
 	        <substitute key="svg" value="ssmiSTPlotDesign.svg"/>
 	        <substitute key="legend" value="SSM/I Sea Temperature (C)"/>
 	        <substitute key="offset" value="1800"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml" 
-               menuText="SSM/I VIL" id="SSMIDataLine"
-               productInterval="3600" productOffset="1800">
+               menuText="SSM/I VIL" id="SSMIDataLine">
 	        <substitute key="svg" value="ssmiVILPlotDesign.svg"/>
 	        <substitute key="legend" value="SSM/I Vert. Integ. Water (kg/(m**2))"/>
 	        <substitute key="offset" value="1800"/>
 	    </contribute>
 	</contribute>
        <contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
-               menuText="GOES Sounding Availability" id="goesSoundingAvailability"
-               productInterval="3600" productOffset="1800">
+               menuText="GOES Sounding Availability" id="goesSoundingAvailability">
         <substitute key="pluginName" value="goessounding"/>
         <substitute key="plotSource" value="GOES Sounding Availability"/>
         <substitute key="offset" value="1800"/>
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
-               menuText="POES Sounding Availability" id="poesSoundingAvailability"
-               productInterval="3600" productOffset="1800">
+               menuText="POES Sounding Availability" id="poesSoundingAvailability">
         <substitute key="pluginName" value="poessounding"/>
         <substitute key="plotSource" value="POES Sounding Availability"/>
         <substitute key="offset" value="1800"/>
diff --git a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
index 1a7144ae03..04e9d2b022 100644
--- a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
+++ b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
@@ -22,55 +22,44 @@
 	<!-- 
 	<contribute xsi:type="bundleItem" file="bundles/LocalCWASPS.xml" 
               menuText="Local CWA SPS" id="localCWASPS">
-        <dataURI>/warning/%</dataURI>
     </contribute>
     -->
 	<contribute xsi:type="bundleItem" file="bundles/LocalCWAWarnings.xml" 
               menuText="Local CWA Warnings" id="localCWAWarnings">
-        <dataURI>/warning/%</dataURI>
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/LocalCWAFloodWarnings.xml" 
               menuText="Local CWA Flood Warnings" id="localCWAFloodWarnings">
-        <dataURI>/warning/%</dataURI>
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/MarineWarning.xml" 
               menuText="Marine Warnings" id="marineWarnings">
-        <dataURI>/warning/%</dataURI>
     </contribute>
 			
 	<contribute xsi:type="subMenu" menuText="Other Warning Displays">
 		<contribute xsi:type="bundleItem" file="bundles/LocalRegionalWarnings.xml" 
               menuText="Local and Regional Warnings" id="localRegionalWarnings">
-	        <dataURI>/warning/%</dataURI>
 	    </contribute> 
 		<contribute xsi:type="bundleItem" file="bundles/LocalRegionalFloodWarnings.xml" 
               menuText="Local and Regional Flood Warnings" id="localRegionalFloodWarnings">
-	        <dataURI>/warning/%</dataURI>
 	    </contribute>   
 		<contribute xsi:type="bundleItem" file="bundles/AllLocalWarnings.xml" 
               menuText="All Local Warnings" id="allLocalWarnings">
-	        <dataURI>/warning/%</dataURI>
 	    </contribute>    
 	    <contribute xsi:type="bundleItem" file="bundles/AllRegionalWarnings.xml" 
               menuText="All Regional Warnings" id="allRegionalWarnings">
-	        <dataURI>/warning/%</dataURI>
 	    </contribute>
     </contribute>
     <!--  There is no support in the backend for these reports -->
     <contribute xsi:type="subMenu" menuText="Local Storm Reports">
 	    <contribute xsi:type="bundleItem" file="bundles/LocalStormReportsOffice.xml"
 			menuText="Office" id="office" >
-			<dataURI>/lsr/%</dataURI>
 	    	<substitute key="title" value="Local Storm Reports"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/LocalStormReportsLocal.xml"
 			menuText="Local" id="local" >
-			<dataURI>/lsr/%</dataURI>
 	    	<substitute key="title" value="Local Storm Reports"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/LocalStormReportsRegion.xml"
 			menuText="Region" id="region" >
-			<dataURI>/lsr/%</dataURI>
 	    	<substitute key="title" value="Local Storm Reports"/>
 		</contribute>