diff --git a/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java b/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java
index 16bff21cb03..0cce277fe93 100644
--- a/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java
+++ b/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java
@@ -3292,10 +3292,17 @@ public static boolean determineNoteRole(CaseManagementNote note, String provider
         boolean programSet = false;
 
         if (note.getProgram_no() != null && note.getProgram_no().length() > 0 && !"null".equals(note.getProgram_no())) {
-            ProgramProvider pp = programProviderDao.getProgramProvider(note.getProviderNo(), Long.valueOf(note.getProgram_no()));
-            if (pp != null) {
-                note.setReporter_caisi_role(String.valueOf(pp.getRoleId()));
-                programSet = true;
+            try {
+                Long programId = Long.valueOf(note.getProgram_no());
+                if (programId > 0) {
+                    ProgramProvider pp = programProviderDao.getProgramProvider(note.getProviderNo(), programId);
+                    if (pp != null) {
+                        note.setReporter_caisi_role(String.valueOf(pp.getRoleId()));
+                        programSet = true;
+                    }
+                }
+            } catch (NumberFormatException e) {
+                // Invalid program number format, skip program provider lookup
             }
         }
 
diff --git a/src/main/webapp/WEB-INF/classes/struts.xml b/src/main/webapp/WEB-INF/classes/struts.xml
index b06861b2e75..7605ae523da 100644
--- a/src/main/webapp/WEB-INF/classes/struts.xml
+++ b/src/main/webapp/WEB-INF/classes/struts.xml
@@ -1462,6 +1462,9 @@
         <action name="oscarResearch/oscarDxResearch/setupDxResearch" class="ca.openosp.openo.dxresearch.pageUtil.dxSetupResearch2Action">
             <result name="success">/oscarResearch/oscarDxResearch/dxResearch.jsp</result>
         </action>
+        <action name="oscarResearch/dxresearch/setupDxResearch" class="ca.openosp.openo.dxresearch.pageUtil.dxSetupResearch2Action">
+            <result name="success">/oscarResearch/oscarDxResearch/dxResearch.jsp</result>
+        </action>
         <action name="oscarResearch/oscarDxResearch/dxResearch" class="ca.openosp.openo.dxresearch.pageUtil.dxResearch2Action">
             <result name="codeSearch">/oscarResearch/oscarDxResearch/dxcodeSearch.do</result>
             <result name="success">/oscarResearch/oscarDxResearch/setupDxResearch.do</result>
@@ -1473,6 +1476,9 @@
         <action name="oscarResearch/oscarDxResearch/dxResearchUpdate" class="ca.openosp.openo.dxresearch.pageUtil.dxResearchUpdate2Action">
             <result name="success">/oscarResearch/oscarDxResearch/setupDxResearch.do</result>
         </action>
+        <action name="oscarResearch/dxresearch/dxResearchUpdate" class="ca.openosp.openo.dxresearch.pageUtil.dxResearchUpdate2Action">
+            <result name="success">/oscarResearch/oscarDxResearch/setupDxResearch.do</result>
+        </action>
         <action name="oscarResearch/oscarDxResearch/dxResearchLoadQuickList" class="ca.openosp.openo.dxresearch.pageUtil.dxResearchLoadQuickList2Action">
             <result name="success">/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp</result>
         </action>
diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp
index 7f413590c3d..b71f8c82fe0 100644
--- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp
+++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp
@@ -97,7 +97,7 @@
               href="${pageContext.servletContext.contextPath}/library/bootstrap/3.0.0/css/bootstrap.min.css"/>
         <link rel="stylesheet" type="text/css" media="all"
               href="${pageContext.servletContext.contextPath}/library/bootstrap/3.0.0/css/bootstrap-theme.min.css"/>
-        <link rel="stylesheet" type="text/css" href="dxResearch.css">
+        <link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
 
         <script type="text/javascript">
             //<!--
diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchCustomization.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchCustomization.jsp
index d9ea8204771..e027023a7c9 100644
--- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchCustomization.jsp
+++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchCustomization.jsp
@@ -34,7 +34,7 @@
         <title><fmt:setBundle basename="oscarResources"/><fmt:message key="oscarResearch.oscarDxResearch.dxCustomization.title"/></title>
         <script type="text/javascript" src="${pageContext.servletContext.contextPath}/js/global.js"></script>
         <base href="<%= request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/" %>">
-        <link rel="stylesheet" type="text/css" href="dxResearch.css"/>
+        <link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css"/>
 
     </head>
 
diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchEditQuickList.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchEditQuickList.jsp
index c93b9fbe7ba..4a1c6d02fa0 100644
--- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchEditQuickList.jsp
+++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchEditQuickList.jsp
@@ -34,7 +34,7 @@
     int Count = 0;
 %>
 
-<link rel="stylesheet" type="text/css" href="dxResearch.css">
+<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
 <html>
     <head>
         <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchNewQuickList.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchNewQuickList.jsp
index bd57bccfccc..991c8e76926 100644
--- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchNewQuickList.jsp
+++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchNewQuickList.jsp
@@ -29,7 +29,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 
-<link rel="stylesheet" type="text/css" href="dxResearch.css">
+<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
 <html>
     <head>
         <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectAssociations.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectAssociations.jsp
index 7f94066ef42..ccc328116f0 100644
--- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectAssociations.jsp
+++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectAssociations.jsp
@@ -25,7 +25,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <html>
     <head>
-        <link rel="stylesheet" type="text/css" href="dxResearch.css">
+        <link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
         <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
         <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/js/jquery_css/smoothness/jquery-ui-1.10.2.custom.min.css"/>
         <script type="text/javascript" src="<%= request.getContextPath() %>/js/jquery-1.9.1.js"></script>
@@ -99,7 +99,7 @@
         </script>
 
     </head>
-    <link rel="stylesheet" type="text/css" href="dxResearch.css">
+    <link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
     <body class="BodyStyle" vlink="#0000FF" rightmargin="0" leftmargin="0"
           topmargin="0" marginwidth="0" marginheight="0" onload="setfocus()" bgcolor="#EEEEFF">
     <!--  -->
diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp
index 24a4ec437bd..65ce3441e63 100644
--- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp
+++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp
@@ -29,7 +29,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
-<link rel="stylesheet" type="text/css" href="dxResearch.css">
+<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
 <html>
     <head>
         <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>