diff --git a/WebContent/WEB-INF/dwr.xml b/WebContent/WEB-INF/dwr.xml
index 2d6c68637b..0931ab2299 100644
--- a/WebContent/WEB-INF/dwr.xml
+++ b/WebContent/WEB-INF/dwr.xml
@@ -20,7 +20,7 @@
 
 <dwr>
   <init>
-    <converter id="localizableMessage" class="com.serotonin.web.dwr.LocalizableMessageConverter"/>
+    <converter id="localizableMessageConverter" class="com.serotonin.web.dwr.LocalizableMessageConverter"/>
     <converter id="protocolVersionConverter" class="com.serotonin.mango.web.dwr.ProtocolVersionConverter"/>
     <converter id="xssDataPointVoConverter" class="com.serotonin.mango.web.dwr.XssDataPointVoConverter"/>
     <converter id="xssDataPointBeanConverter" class="com.serotonin.mango.web.dwr.XssDataPointBeanConverter"/>
@@ -161,7 +161,7 @@
       <param name="include" value="id,xid,name,extendedName,dataSourceId,enabled,dataTypeMessage,pointLocator,engineeringUnits"/>
     </convert>
     <convert converter="xssDataPointBeanConverter" match="com.serotonin.mango.web.dwr.beans.DataPointBean">
-      <param name="include" value="id,xid,name,settable,dataType,dataTypeMessage,chartColour"/>
+      <param name="include" value="id,xid,name,settable,dataType,dataTypeMessage,chartColour,enabled"/>
     </convert>
     <convert converter="bean" match="com.serotonin.mango.vo.User">
       <param name="include" value="id,username,email,phone,admin,disabled,receiveAlarmEmails,receiveOwnAuditEvents,dataSourcePermissions,dataPointPermissions,userProfile,homeUrl,hideMenu,theme,firstName,lastName,enableFullScreen,hideShortcutDisableFullScreen"/>
@@ -190,7 +190,7 @@
     <convert converter="bean" match="com.serotonin.web.dwr.DwrMessageI18n"/>
     <convert converter="bean" match="com.serotonin.web.dwr.DwrResponseI18n"/>
 
-    <convert converter="localizableMessage" match="com.serotonin.web.i18n.LocalizableMessage"/>
+    <convert converter="localizableMessageConverter" match="com.serotonin.web.i18n.LocalizableMessage"/>
     <convert converter="bean" match="br.org.scadabr.vo.scripting.ScriptVO">
     	<param name="exclude" value="type"/>
     </convert>
diff --git a/WebContent/WEB-INF/jsp/dataPointDetails.jsp b/WebContent/WEB-INF/jsp/dataPointDetails.jsp
index fd1ad7473d..8e9773db1c 100644
--- a/WebContent/WEB-INF/jsp/dataPointDetails.jsp
+++ b/WebContent/WEB-INF/jsp/dataPointDetails.jsp
@@ -34,13 +34,25 @@
         </c:if>
         <c:if test="${!empty flipbookLimit}">getFlipbookChart();</c:if>
         getStatsChart();
-        
-        jQuery("#datPointDetailsPointSelect").chosen({
-			allow_single_deselect: true,
-			placeholder_text_single: " ",
-			search_contains: true,
-			width: "400px"
-       	});
+
+        let pointsArray = new Array();
+
+        <c:forEach items="${userPoints}" var="dp">
+            pointsArray[pointsArray.length] = {
+                id : "<c:out value="${dp.id}"/>",
+                name : "<c:out value="${dp.extendedName}"/>",
+                xid : "<c:out value="${dp.xid}"/>",
+                dataType : "<sst:i18n message="${dp.dataTypeMessage}"/>"
+            };
+        </c:forEach>
+
+        let datPointDetailsPointSelect = new DataPointsSelect({
+            selectHtmlId: "datPointDetailsPointSelect",
+            placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+            pointsArray: pointsArray.filter((point) => point.id == <c:out value="${point.id}" />),
+            invisibleEmptyOption: true,
+            imgAddHtmlIds: ["bullet_go_left", "bullet_go"]
+        });
     }
     
     //
@@ -152,33 +164,22 @@
     function swapFlipbookImage(uri) {
         $("flipbookImage").src = uri;
     }
-    
-    jQuery(document).ready(function(){
-    	(function($) {
-    		loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css"); 	
-			loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-		})(jQuery);
-    });
   </script>
   
   <table width="100%">
     <tr>
       <td valign="top" align="right">
         <spring:message code="pointDetails.goto"/>:&nbsp;
-        <sst:select id="datPointDetailsPointSelect" value="${point.id}" onchange="window.location='data_point_details.shtm?dpid='+ this.value;">
-          <c:forEach items="${userPoints}" var="point">
-            <sst:option value="${point.id}"><c:out value="${point.extendedName}"/></sst:option>
-          </c:forEach>
-        </sst:select>
+        <select id="datPointDetailsPointSelect" value="${point.id}" onchange="window.location='data_point_details.shtm?dpid='+ this.value;" style="display:none;"></select>
 
         <c:if test="${!empty prevId}">
-          <tag:img png="bullet_go_left" title="pagination.previous"
-                  onclick="window.location='data_point_details.shtm?dpid=${prevId}'"/>
+          <tag:img id="bullet_go_left" png="bullet_go_left" title="pagination.previous"
+                  onclick="window.location='data_point_details.shtm?dpid=${prevId}'" style="display:none;"/>
         </c:if>
         
         <c:if test="${!empty nextId}">
-          <tag:img png="bullet_go" title="pagination.next"
-                  onclick="window.location='data_point_details.shtm?dpid=${nextId}'"/>
+          <tag:img id="bullet_go" png="bullet_go" title="pagination.next"
+                  onclick="window.location='data_point_details.shtm?dpid=${nextId}'" style="display:none;"/>
         </c:if>
       </td>
     </tr>
diff --git a/WebContent/WEB-INF/jsp/dataPointEdit.jsp b/WebContent/WEB-INF/jsp/dataPointEdit.jsp
index 2ec64a8f01..9ab965889c 100644
--- a/WebContent/WEB-INF/jsp/dataPointEdit.jsp
+++ b/WebContent/WEB-INF/jsp/dataPointEdit.jsp
@@ -83,14 +83,14 @@
       <tr>
         <td>
             <script>
-                    function init() {
-                        jQuery("#selected_base_on_existing_point_chooser").chosen({
-                            allow_single_deselect: true,
-                            placeholder_text_single: "<spring:message code='chosen.selector.selectPoint'/>",
-                            search_contains: true,
-                            width: "400px"
-                        });
-                    }
+                   function init() {
+                       let dataTypeId = <c:out value="${form.pointLocator.dataTypeId}" />;
+                       let selectedBaseOnExistingPointChooser = new DataPointsSelect({
+                           selectHtmlId: "selected_base_on_existing_point_chooser",
+                           placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                           dataTypes: [dataTypeId]
+                       });
+                   }
 
                    function checkGetAlertError() {
                      return jQuery("#checkGetAlertError").prop('checked');
@@ -892,13 +892,6 @@
                            					        	});
                   }
 
-                    jQuery(document).ready(function(){
-                        (function($) {
-                            loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-                            loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-                        })(jQuery);
-                    });
-
                    jQuery(document).ready(function() {
                        function updateSuffixForEngineeringUnits() {
                            let value = jQuery("select[name='engineeringUnits']").val();
@@ -945,9 +938,6 @@
                             <td class="formLabelRequired"><spring:message code="pointEdit.basing_on.select"/></td>
                             <td colspan="2" class="formField">
                                 <select id="selected_base_on_existing_point_chooser">
-                                    <c:forEach items="${userPoints}" var="point">
-                                        <sst:option value="${point.id}"><c:out value="${point.extendedName}"/></sst:option>
-                                    </c:forEach>
                                 </select>
                             </td>
                         </tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit.jsp
index d516b98491..c2f5d13e8e 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit.jsp
@@ -87,8 +87,8 @@
         hide(dsStatus);
 
         if (typeof initImpl == 'function') initImpl();
-
-        DataSourceEditDwr.editInit(initCB);
+        let dataSourceId = '${dataSource.id}' ? '${dataSource.id}': '-1';
+        DataSourceEditDwr.editInit(dataSourceId, initCB);
         showMessage("dataSourceMessage");
         showMessage("pointMessage");
     }
@@ -209,23 +209,23 @@
             var childs = document.getElementById("editImg" + currentPoint.id).parentNode.parentNode.childNodes;
             if (currentPoint.id!=-1) markRow(childs, false);
         }
-        DataSourceEditDwr.getPoint(pointId, editPointCB);
+        DataSourceEditDwr.getPointResponse(pointId, function(response){editPointCB(response.data.point, response.data.contextPoints)});
         hideContextualMessages("pointProperties");
     }
 
-    function editPointCB(point) {
+    function editPointCB(point, contextPoints) {
         currentPoint = point;
-        display("pointDeleteImg", point.id != <c:out value="<%=Common.NEW_ID%>"/>);
-        var locator = currentPoint.pointLocator;
+        display("pointDeleteImg", currentPoint.id != <c:out value="<%=Common.NEW_ID%>"/>);
+        let locator = currentPoint.pointLocator;
 
         $set("name", unescapeHtml(currentPoint.name));
         $set("xid", unescapeHtml(currentPoint.xid));
         var cancel;
-        if (typeof editPointCBImpl == 'function') cancel = editPointCBImpl(locator);
+        if (typeof editPointCBImpl == 'function') cancel = editPointCBImpl(locator, contextPoints);
         if (!cancel) {
-            startImageFader("editImg"+ point.id);
-            if(point.id!=-1) {
-            	var childs = document.getElementById("editImg" + point.id).parentNode.parentNode.childNodes;
+            startImageFader("editImg"+ currentPoint.id);
+            if(currentPoint.id!=-1) {
+            	var childs = document.getElementById("editImg" + currentPoint.id).parentNode.parentNode.childNodes;
 				markRow(childs, true);
             }
             show("pointDetails");
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editJmx.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editJmx.jsp
index cd74362c4b..e609bdbd93 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editJmx.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editJmx.jsp
@@ -139,8 +139,8 @@
   }
   
   function addPointImpl() {
-      DataSourceEditDwr.getPoint(-1, function(point) {
-          editPointCB(point);
+      DataSourceEditDwr.getPointResponse(-1, function(response) {
+          editPointCB(response.data.point);
           $set("objectName", addPointData.objectName);
           $set("attributeName", addPointData.attrName);
           $set("compositeItemName", addPointData.compositeName);
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editMeta.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editMeta.jsp
index 5dbd4e4e6f..ab301a08a7 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editMeta.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editMeta.jsp
@@ -21,28 +21,11 @@
 <%@page import="com.serotonin.mango.Common"%>
 
 <script type="text/javascript">
-  var pointsArray = new Array();
-  var scriptPointsContext;
+
+  var pointsContext;
   
   function initImpl() {
-      <c:forEach items="${userPoints}" var="dp">
-        pointsArray[pointsArray.length] = {
-            id : ${dp.id}, 
-            name : "<c:out value="${dp.extendedName}"/>",
-            xid : "<c:out value="${dp.xid}"/>",
-            type : "<sst:i18n message="${dp.dataTypeMessage}"/>"
-        };
-      </c:forEach>
-      
       createContextualMessageNode("contextContainer", "context");
-      
-	  jQuery("#allPointsList").chosen({
-      	allow_single_deselect: true,
-		placeholder_text_single: " ",
-		search_contains: true,
-		width: "400px"
-	  });       
-      
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
@@ -67,15 +50,14 @@
       DataSourceEditDwr.saveMetaDataSource($get("dataSourceName"), $get("dataSourceXid"), saveDataSourceCB);
   }
   
-  function editPointCBImpl(locator) {
-      if (this.scriptPointsContext) {
-         for (var i = 0; i < locator.context.length; i++) {
-             this.scriptPointsContext.addToContextArray(locator.context[i].key, locator.context[i].value);
-         }
-         this.scriptPointsContext.writeContextArray();
-      } else {
-         this.scriptPointsContext = new ScriptPointsContext(locator.context, pointsArray);
-      }
+  function editPointCBImpl(locator, contextPoints) {
+
+      pointsContext = new ScriptPointsContext(new DataPointsSelect({
+          placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+          excludePointsArray: locator.context,
+          pointsArray: contextPoints
+      }));
+
       $set("script", locator.script);
       $set("dataTypeId", locator.dataTypeId);
       $set("settable", locator.settable);
@@ -89,7 +71,7 @@
   }
   
   function savePointImpl(locator) {
-      locator.context = this.scriptPointsContext.convertToSave();
+      locator.context = pointsContext.convertToSave();
       locator.script = $get("script");
       locator.dataTypeId = $get("dataTypeId");
       locator.settable = $get("settable");
@@ -103,7 +85,7 @@
 
   function validateScript() {
       hideContextualMessages("pointProperties");
-      DataSourceEditDwr.validateScript($get("script"), this.scriptPointsContext.convertToSave(), $get("dataTypeId"), validateScriptCB);
+      DataSourceEditDwr.validateScript($get("script"), pointsContext.convertToSave(), $get("dataTypeId"), validateScriptCB);
   }
   
   function validateScriptCB(response) {
@@ -113,13 +95,6 @@
   function updateEventChanged() {
       display("updateCronPatternRow", $get("updateEvent") == <%= MetaPointLocatorVO.UPDATE_EVENT_CRON %>);
   }
-  
-  jQuery(document).ready(function(){    
-  	(function($) {
-		loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css"); 	
-		loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-  	})(jQuery);
-  });
 </script>
 
 <c:set var="dsDesc"><spring:message code="dsEdit.meta.desc"/></c:set>
@@ -145,8 +120,8 @@
   <tr>
     <td class="formLabelRequired"><spring:message code="dsEdit.meta.scriptContext"/></td>
     <td class="formField">
-      <select id="allPointsList"></select>
-      <tag:img png="add" onclick="scriptPointsContext.addPointToContext();" title="common.add"/>
+      <select id="allPointsList" style="display:none;"></select>
+      <tag:img id="icon_add" png="add" onclick="pointsContext.addPointToContext();" title="common.add" style="display:none;"/>
       
       <table cellspacing="1" id="contextContainer">
         <tbody id="contextTableEmpty" style="display:none;">
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp
index 12dfa98e18..3f7f0e8505 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp
@@ -217,8 +217,8 @@
   }
   
   function addPointImpl() {
-	  DataSourceEditDwr.getPoint(-1, function(point) {
-		  editPointCB(point);
+	  DataSourceEditDwr.getPointResponse(-1, function(response) {
+		  editPointCB(response.data.point);
 	      $set("slaveId", $get("test_slaveId"));
 	      $set("range", $get("test_range"));
 	      $set("modbusDataType", $get("test_modbusDataType"));
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editOpc.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editOpc.jsp
index a2f23cb330..d7183e32c4 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editOpc.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editOpc.jsp
@@ -93,7 +93,9 @@
   }
 
   function addTags() {
-	  DataSourceEditDwr.getPoint(-1, addTagsImpl);
+	  DataSourceEditDwr.getPointResponse(-1, function(response) {
+          addTagsImpl(response.data.point);
+      });
   }
   
   function addTagsImpl(point) {
@@ -142,7 +144,9 @@
   }
   
   function btnAddTag() {
-	  DataSourceEditDwr.getPoint(-1, addTagsImplOPC);
+	  DataSourceEditDwr.getPointResponse(-1, function(response) {
+         addTagsImplOPC(response.data.point);
+      });
   }
 
   function addTagsImplOPC(point) {
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editOpcUa.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editOpcUa.jsp
index 93bb87b1db..ce1011eb6b 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editOpcUa.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editOpcUa.jsp
@@ -147,7 +147,9 @@
   }
   
   function btnAddNode() {
-	  DataSourceEditDwr.getPoint(-1, addNodesImplOpcUa);
+	  DataSourceEditDwr.getPointResponse(-1, function(response) {
+         addNodesImplOpcUa(response.data.point);
+      });
   }
 
   function addNodesImplOpcUa(point) {
diff --git a/WebContent/WEB-INF/jsp/eventHandlers.jsp b/WebContent/WEB-INF/jsp/eventHandlers.jsp
index ce3d3b6fe1..e581c2b4ce 100644
--- a/WebContent/WEB-INF/jsp/eventHandlers.jsp
+++ b/WebContent/WEB-INF/jsp/eventHandlers.jsp
@@ -24,13 +24,6 @@
 
 <tag:page dwr="EventHandlersDwr,ScriptsDwr" js="emailRecipients" onload="init">
   <script>
-    jQuery(document).ready(function(){
-      (function($) {
-        loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-        loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-      })(jQuery);
-    });
-
     function init() {
     	ScriptsDwr.getScripts(getScriptsCB);
         EventHandlersDwr.getInitData(initCB);
@@ -38,12 +31,6 @@
         var tree = dojo.widget.manager.getWidgetById('eventTypeTree');
         dojo.event.topic.subscribe("eventTypeTree/titleClick", new TreeClickHandler(), 'handle');
 
-      jQuery("#targetPointSelect, #activePointId, #inactivePointId").chosen({
-        allow_single_deselect: true,
-        placeholder_text_single: "<spring:message code='chosen.selector.selectPoint'/>",
-        search_contains: true,
-        width: "400px"
-      });
     }
 
 	function getScriptsCB(scripts) {
@@ -263,21 +250,17 @@
         }
     }
 
+    var targetPointIdSelect;
+    var activePointIdSelect;
+    var inactivePointIdSelect;
+
     function showHandlerEdit() {
     	show("handlerEditDiv");
         setUserMessage("");
         // Set the target points.
         var pointSelect = $("targetPointSelect");
-        dwr.util.removeAllOptions(pointSelect);
-        for (var i=0; i<allPoints.length; i++) {
-            dp = allPoints[i];
-            if (dp.settable)
-                pointSelect.options[pointSelect.options.length] = new Option(dp.name, dp.id);
-        }
-      jQuery("#targetPointSelect").trigger("chosen:updated");
-      jQuery("#activePointId").trigger("chosen:updated");
-      jQuery("#inactivePointId").trigger("chosen:updated");
-      if (selectedHandlerNode) {
+
+        if (selectedHandlerNode) {
             $("saveImg").src = "images/save.png";
             show("deleteImg");
 
@@ -289,10 +272,46 @@
             $set("alias", handler.alias);
             $set("disabled", handler.disabled);
             if (handler.handlerType == <c:out value="<%= EventHandlerVO.TYPE_SET_POINT %>"/>) {
-                $set("targetPointSelect", handler.targetPointId);
-                jQuery("#targetPointSelect").trigger("chosen:updated");
+
+                let targetPoint = allPoints.find((point) => point.id == handler.targetPointId);
+                let activePoint = allPoints.find((point) => point.id == handler.activePointId);
+                let inactivePoint = allPoints.find((point) => point.id == handler.inactivePointId);
+
+                if (!targetPoint) {
+                    console.error("Data integrity error: Target point not found for handler", handler.targetPointId);
+                    setUserMessage("<spring:message code='validate.invalidValue'/>");
+                    return;
+                }
+
+                selectedHandlerNode.targetPointIdSelect = new DataPointsSelect({
+                    selectHtmlId: "targetPointSelect",
+                    placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                    pointsArray: [targetPoint],
+                    startAsEmpty: true,
+                    pointSettable: true
+                });
+
+                selectedHandlerNode.activePointIdSelect = new DataPointsSelect({
+                    selectHtmlId: "activePointId",
+                    placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                    excludePointsArray: inactivePoint ? [targetPoint, inactivePoint] : [targetPoint],
+                    pointsArray: activePoint ? [activePoint] : [],
+                    dataTypes: [targetPoint.dataType],
+                    startAsEmpty: true
+                });
+
+                selectedHandlerNode.inactivePointIdSelect = new DataPointsSelect({
+                    selectHtmlId: "inactivePointId",
+                    placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                    excludePointsArray: activePoint ? [targetPoint, activePoint] : [targetPoint],
+                    pointsArray: inactivePoint ? [inactivePoint] : [],
+                    dataTypes: [targetPoint.dataType],
+                    startAsEmpty: true
+                });
+
                 $set("activeAction", handler.activeAction);
                 $set("inactiveAction", handler.inactiveAction);
+                targetPointSelectChanged(handler.targetPointId, handler.activeValueToSet, handler.inactiveValueToSet);
             }
             else if (handler.handlerType == <c:out value="<%= EventHandlerVO.TYPE_EMAIL %>"/>) {
                 emailRecipients.updateRecipientList(handler.activeRecipients);
@@ -314,8 +333,26 @@
                 $set("activeScriptCommand", handler.activeScriptCommand);
                 $set("inactiveScriptCommand", handler.inactiveScriptCommand);
             }
-        }
-        else {
+        } else {
+
+            targetPointIdSelect = new DataPointsSelect({
+                selectHtmlId: "targetPointSelect",
+                placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                pointSettable: true
+            });
+
+            activePointIdSelect = new DataPointsSelect({
+                selectHtmlId: "activePointId",
+                placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                startAsEmpty: true
+            });
+
+            inactivePointIdSelect = new DataPointsSelect({
+                selectHtmlId: "inactivePointId",
+                placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                startAsEmpty: true
+            });
+
             $("saveImg").src = "images/save_add.png";
             hide("deleteImg");
             $("handlerTypeSelect").disabled = false;
@@ -346,14 +383,13 @@
         handlerTypeChanged();
         activeActionChanged();
         inactiveActionChanged();
-        targetPointSelectChanged();
         sendEscalationChanged();
         sendInactiveChanged();
 
     }
 
     var currentHandlerEditor;
-    function handlerTypeChanged() {
+    function handlerTypeChanged(option) {
         setUserMessage("");
         var handlerId = $get("handlerTypeSelect");
 
@@ -370,49 +406,184 @@
         if(currentHandlerEditor.id === "handler<c:out value="<%= EventHandlerVO.TYPE_SMS %>"/>") {
             show($(currentHandlerEditor.id + "Help"));
         }
-        console.log("handler<c:out value="<%= EventHandlerVO.TYPE_SMS %>"/>");
+
+        if(currentHandlerEditor.id === "handler<c:out value="<%= EventHandlerVO.TYPE_SET_POINT %>"/>") {
+            targetPointSelectChanged();
+        }
+    }
+
+    function doTargetPointSelectChanged(pointIdForm, activeValue, inactiveValue) {
+        resetForm();
+        targetPointSelectChanged(pointIdForm, activeValue, inactiveValue);
+    }
+
+    function resetForm() {
+        resetActivePoint();
+        resetActiveStatic();
+        resetInactivePoint();
+        resetInactiveStatic();
+        jQuery("#activeAction").val(<c:out value="<%= EventHandlerVO.SET_ACTION_NONE %>"/>);
+        jQuery("#inactiveAction").val(<c:out value="<%= EventHandlerVO.SET_ACTION_NONE %>"/>);
+
+        hide("activePointIdRow");
+        hide("activeValueToSetRow");
+        hide("inactivePointIdRow");
+        hide("inactiveValueToSetRow");
+        hide("escalationAddresses1");
+        hide("escalationAddresses2");
+    }
+
+    function resetActivePoint() {
+        let activePointSelect;
+        if(selectedHandlerNode) {
+            activePointSelect = selectedHandlerNode.activePointIdSelect;
+        } else {
+            activePointSelect = activePointIdSelect;
+        }
+
+        if(activePointSelect) {
+            activePointSelect.setPointId(undefined);
+            inactivePointSelectChanged();
+        }
+    }
+
+    function resetInactivePoint() {
+        let inactivePointSelect;
+        if(selectedHandlerNode) {
+            inactivePointSelect = selectedHandlerNode.inactivePointIdSelect;
+        } else {
+            inactivePointSelect = inactivePointIdSelect;
+        }
+
+        if(inactivePointSelect) {
+            inactivePointSelect.setPointId(undefined);
+            activePointSelectChanged();
+        }
     }
 
-    function targetPointSelectChanged() {
-        var selectControl = $("targetPointSelect");
+    function resetActiveStatic() {
+        if(selectedHandlerNode) {
+            if(selectedHandlerNode.object) {
+                selectedHandlerNode.object.activeValueToSet = "";
+            }
+        }
+    }
+
+    function resetInactiveStatic() {
+        if(selectedHandlerNode) {
+            if(selectedHandlerNode.object) {
+                selectedHandlerNode.object.inactiveValueToSet = "";
+            }
+        }
+    }
+
+    function targetPointSelectChanged(pointIdForm, activeValue, inactiveValue) {
+        let selectControl = $("targetPointSelect");
 
         // Make sure there are points in the list.
         if (selectControl.options.length == 0)
             return;
 
         // Get the content for the value to set section.
-        var targetPointId = selectControl.value;
-        var activeValueStr = "";
-        var inactiveValueStr = "";
-        if (selectedHandlerNode) {
-            activeValueStr = selectedHandlerNode.object.activeValueToSet;
-            inactiveValueStr = selectedHandlerNode.object.inactiveValueToSet;
-        }
-        EventHandlersDwr.createSetValueContent(targetPointId, activeValueStr, "Active",
-                function(content) { $("activeValueToSetContent").innerHTML = content; });
-        EventHandlersDwr.createSetValueContent(targetPointId, inactiveValueStr, "Inactive",
-                function(content) { $("inactiveValueToSetContent").innerHTML = content; });
-
-        // Update the source point lists.
-        var targetDataTypeId = getPoint(targetPointId).dataType;
-        var activeSourceSelect = $("activePointId");
-        dwr.util.removeAllOptions(activeSourceSelect);
-        var inactiveSourceSelect = $("inactivePointId");
-        dwr.util.removeAllOptions(inactiveSourceSelect);
-        for (var i=0; i<allPoints.length; i++) {
-            dp = allPoints[i];
-            if (dp.id != targetPointId && dp.dataType == targetDataTypeId) {
-                activeSourceSelect.options[activeSourceSelect.options.length] = new Option(dp.name, dp.id);
-                inactiveSourceSelect.options[inactiveSourceSelect.options.length] = new Option(dp.name, dp.id);
+        let targetPointId = pointIdForm ? pointIdForm : selectControl.value;
+        let activeValueStr = "";
+        let inactiveValueStr = "";
+        let targetPointSelect = selectedHandlerNode ? selectedHandlerNode.targetPointIdSelect : targetPointIdSelect;
+
+        if(targetPointId && targetPointId > 0) {
+            let activeAction = document.getElementById('activeAction');
+            activeAction.disabled = false;
+            let inactiveAction = document.getElementById('inactiveAction');
+            inactiveAction.disabled = false;
+
+            if (selectedHandlerNode) {
+                activeValueStr = activeValue ? activeValue : selectedHandlerNode.object.activeValueToSet;
+                inactiveValueStr = inactiveValue ? inactiveValue : selectedHandlerNode.object.inactiveValueToSet;
+
+                EventHandlersDwr.createSetValueContent(targetPointId, activeValueStr, "Active",
+                        function(content) { $("activeValueToSetContent").innerHTML = content; });
+                EventHandlersDwr.createSetValueContent(targetPointId, inactiveValueStr, "Inactive",
+                        function(content) { $("inactiveValueToSetContent").innerHTML = content; });
+
+            } else {
+                EventHandlersDwr.createSetValueContent(targetPointId, "", "Active",
+                        function(content) { $("activeValueToSetContent").innerHTML = content; });
+                EventHandlersDwr.createSetValueContent(targetPointId, "", "Inactive",
+                        function(content) { $("inactiveValueToSetContent").innerHTML = content; });
             }
+
+            activePointSelectChanged();
+            inactivePointSelectChanged();
+            targetPointSelect.setPointId(targetPointId);
+        } else {
+            let activeAction = document.getElementById('activeAction');
+            activeAction.disabled = true;
+            let inactiveAction = document.getElementById('inactiveAction');
+            inactiveAction.disabled = true;
         }
+        targetPointSelect.loadPointsList();
+    }
 
-        if (selectedHandlerNode) {
-            $set(activeSourceSelect, selectedHandlerNode.object.activePointId);
-            $set(inactiveSourceSelect, selectedHandlerNode.object.inactivePointId);
+    function activePointSelectChanged() {
+        let targetPointSelect = selectedHandlerNode ? selectedHandlerNode.targetPointIdSelect : targetPointIdSelect;
+        let activePointSelect = selectedHandlerNode ? selectedHandlerNode.activePointIdSelect : activePointIdSelect;
+        let inactivePointSelect = selectedHandlerNode ? selectedHandlerNode.inactivePointIdSelect : inactivePointIdSelect;
+
+        if(targetPointSelect && activePointSelect && inactivePointSelect) {
+            let targetPoint = targetPointSelect.getPoint();
+            let activePoint = activePointSelect.getPoint();
+            let inactiveId = inactivePointSelect.getPointId();
+
+            if(targetPoint) {
+                inactivePointSelect.setDataTypes([targetPoint.dataType]);
+                if(activePoint) {
+                    inactivePointSelect.updatePointsList([targetPoint, activePoint]);
+                } else {
+                    inactivePointSelect.updatePointsList([targetPoint]);
+                }
+            } else {
+                if(activePoint) {
+                    inactivePointSelect.updatePointsList([activePoint]);
+                }
+            }
+            if(inactiveId > 0) {
+                inactivePointSelect.setPointId(inactiveId);
+            } else {
+                inactivePointSelect.setPointId(undefined);
+            }
+            inactivePointSelect.loadPointsList();
+        }
+    }
+
+    function inactivePointSelectChanged() {
+        let targetPointSelect = selectedHandlerNode ? selectedHandlerNode.targetPointIdSelect : targetPointIdSelect;
+        let activePointSelect = selectedHandlerNode ? selectedHandlerNode.activePointIdSelect : activePointIdSelect;
+        let inactivePointSelect = selectedHandlerNode ? selectedHandlerNode.inactivePointIdSelect : inactivePointIdSelect;
+
+        if(targetPointSelect && activePointSelect && inactivePointSelect) {
+            let targetPoint = targetPointSelect.getPoint();
+            let inactivePoint = inactivePointSelect.getPoint();
+            let activeId = activePointSelect.getPointId();
+
+            if(targetPoint) {
+                activePointSelect.setDataTypes([targetPoint.dataType]);
+                if(inactivePoint) {
+                    activePointSelect.updatePointsList([targetPoint, inactivePoint]);
+                } else {
+                    activePointSelect.updatePointsList([targetPoint]);
+                }
+            } else {
+                if(inactivePoint) {
+                    activePointSelect.updatePointsList([inactivePoint]);
+                }
+            }
+            if(activeId > 0) {
+                activePointSelect.setPointId(activeId);
+            } else {
+                activePointSelect.setPointId(undefined);
+            }
+            activePointSelect.loadPointsList();
         }
-        jQuery("#activePointId").trigger("chosen:updated");
-        jQuery("#inactivePointId").trigger("chosen:updated");
     }
 
     function activeActionChanged() {
@@ -420,15 +591,18 @@
         if (action == <c:out value="<%= EventHandlerVO.SET_ACTION_POINT_VALUE %>"/>) {
         	show("activePointIdRow");
             hide("activeValueToSetRow");
-        }
-        else if (action == <c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>) {
+            resetActiveStatic();
+        } else if (action == <c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>) {
         	hide("activePointIdRow");
         	show("activeValueToSetRow");
-        }
-        else {
+        	resetActivePoint();
+        } else {
         	hide("activePointIdRow");
         	hide("activeValueToSetRow");
+        	resetActivePoint();
+        	resetActiveStatic();
         }
+        activePointSelectChanged();
     }
 
     function inactiveActionChanged() {
@@ -436,15 +610,18 @@
         if (action == <c:out value="<%= EventHandlerVO.SET_ACTION_POINT_VALUE %>"/>) {
         	show("inactivePointIdRow");
             hide("inactiveValueToSetRow");
-        }
-        else if (action == <c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>) {
+            resetInactiveStatic();
+        } else if (action == <c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>) {
         	hide("inactivePointIdRow");
         	show("inactiveValueToSetRow");
-        }
-        else {
+        	resetInactivePoint();
+        } else {
         	hide("inactivePointIdRow");
         	hide("inactiveValueToSetRow");
+        	resetInactivePoint();
+        	resetInactiveStatic();
         }
+        inactivePointSelectChanged();
     }
 
     function sendEscalationChanged() {
@@ -458,10 +635,6 @@
         }
     }
 
-    function getPoint(id) {
-        return getElement(allPoints, id);
-    }
-
     function saveHandler() {
     	startImageFader("saveImg");
         setUserMessage();
@@ -496,11 +669,27 @@
             EventHandlersDwr.saveSmsEventHandler(selectedEventTypeNode.object.typeId,
                     selectedEventTypeNode.object.typeRef1, selectedEventTypeNode.object.typeRef2, handlerId, xid, alias, disabled, smsList, saveEventHandlerCB);
           } else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_SET_POINT %>"/>) {
+
+            let activePointId = $get("activePointId");
+            activePointId = convertToInt(activePointId);
+
+            let inactivePointId = $get("inactivePointId");
+            inactivePointId = convertToInt(inactivePointId);
+
+            let targetPointSelect = selectedHandlerNode && selectedHandlerNode.targetPointIdSelect ? selectedHandlerNode.targetPointIdSelect : targetPointIdSelect;
+
             EventHandlersDwr.saveSetPointEventHandler(selectedEventTypeNode.object.typeId,
                     selectedEventTypeNode.object.typeRef1, selectedEventTypeNode.object.typeRef2, handlerId, xid, alias,
-                    disabled, $get("targetPointSelect"), $get("activeAction"), $get("setPointValueActive"),
-                    $get("activePointId"), $get("inactiveAction"), $get("setPointValueInactive"),
-                    $get("inactivePointId"), saveEventHandlerCB);
+                    disabled, targetPointSelect.getPointId(), $get("activeAction"), $get("setPointValueActive"),
+                    activePointId, $get("inactiveAction"), $get("setPointValueInactive"),
+                    inactivePointId, function(response) {
+                        if(!response.hasMessages) {
+                            allPoints = response.data.allPoints;
+                            let handler = response.data.handler;
+                            targetPointSelectChanged(handler.targetPointId, handler.activeValueToSet, handler.inactiveValueToSet);
+                        }
+                        saveEventHandlerCB(response);
+                    });
           } else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_PROCESS %>"/>) {
             EventHandlersDwr.saveProcessEventHandler(selectedEventTypeNode.object.typeId,
                     selectedEventTypeNode.object.typeRef1, selectedEventTypeNode.object.typeRef2, handlerId, xid,
@@ -619,7 +808,7 @@
             <tr>
               <td class="formLabelRequired"><spring:message code="eventHandlers.type"/></td>
               <td class="formField">
-                <select id="handlerTypeSelect" onchange="handlerTypeChanged()">
+                <select id="handlerTypeSelect" onchange="handlerTypeChanged(this)">
                   <option value="<c:out value="<%= EventHandlerVO.TYPE_EMAIL %>"/>"><spring:message code="eventHandlers.type.email"/></option>
                   <option value="<c:out value="<%= EventHandlerVO.TYPE_SET_POINT %>"/>"><spring:message code="eventHandlers.type.setPoint"/></option>
                   <option value="<c:out value="<%= EventHandlerVO.TYPE_PROCESS %>"/>"><spring:message code="eventHandlers.type.process"/></option>
@@ -662,7 +851,8 @@
                 <select id="targetPointSelect"
                         class="chzn-select"
                         data-placeholder="<spring:message code='chosen.selector.selectPoint'/>"
-                        onchange="targetPointSelectChanged()">
+                        onchange="doTargetPointSelectChanged(this.value)"
+                        style="display:none;">
                 </select>
               </td>
             </tr>
@@ -670,7 +860,7 @@
             <tr>
               <td class="formLabelRequired"><spring:message code="eventHandlers.activeAction"/></td>
               <td class="formField">
-                <select id="activeAction" onchange="activeActionChanged()">
+                <select id="activeAction" onchange="activeActionChanged()" disabled>
                   <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_NONE %>"/>"><spring:message code="eventHandlers.action.none"/></option>
                   <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_POINT_VALUE %>"/>"><spring:message code="eventHandlers.action.point"/></option>
                   <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>"><spring:message code="eventHandlers.action.static"/></option>
@@ -683,7 +873,9 @@
               <td class="formField">
                 <select id="activePointId"
                         class="chzn-select"
-                        data-placeholder="<spring:message code='chosen.selector.selectPoint'/>">
+                        data-placeholder="<spring:message code='chosen.selector.selectPoint'/>"
+                        onchange="activePointSelectChanged()"
+                        style="display:none;">
                 </select>
               </td>
             </tr>
@@ -696,7 +888,7 @@
             <tr>
               <td class="formLabelRequired"><spring:message code="eventHandlers.inactiveAction"/></td>
               <td class="formField">
-                <select id="inactiveAction" onchange="inactiveActionChanged()">
+                <select id="inactiveAction" onchange="inactiveActionChanged()" disabled>
                   <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_NONE %>"/>"><spring:message code="eventHandlers.action.none"/></option>
                   <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_POINT_VALUE %>"/>"><spring:message code="eventHandlers.action.point"/></option>
                   <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>"><spring:message code="eventHandlers.action.static"/></option>
@@ -709,7 +901,9 @@
               <td class="formField">
                 <select id="inactivePointId"
                         class="chzn-select"
-                        data-placeholder="<spring:message code='chosen.selector.selectPoint'/>">
+                        data-placeholder="<spring:message code='chosen.selector.selectPoint'/>"
+                        onchange="inactivePointSelectChanged()"
+                        style="display:none;">
                 </select>
               </td>
             </tr>
diff --git a/WebContent/WEB-INF/jsp/include/compoundEditor.jsp b/WebContent/WEB-INF/jsp/include/compoundEditor.jsp
index 0d36523bce..d785d8dc31 100644
--- a/WebContent/WEB-INF/jsp/include/compoundEditor.jsp
+++ b/WebContent/WEB-INF/jsp/include/compoundEditor.jsp
@@ -135,18 +135,22 @@
 		constructor() {
 			this.component = null;
         	this.pointList = [];
+        	this.targetPointSelects = [];
 		}
 
 		open(compId) {
 			document.getElementById("compoundEditorPopup").firstElementChild.setAttribute("id", "compound" + compId);
-			ViewDwr.getViewComponent(compId, viewId, (comp) => {
-                this.component = comp;
+			ViewDwr.getViewComponentResponse(compId, viewId, (response) => {
+                this.component = response.data.comp;
+                let comp = this.component;
+
                 $set("compoundComponentName", comp.displayName);
 				$set("compoundPositionX", comp.x);
                 $set("compoundPositionY", comp.y);
                 
                 // Update the point lists
-                this.updatePointLists();
+                compoundEditor.setPointList(response.data.pointList);
+                compoundEditor.updatePointLists();
                 
                 // Update the data in the form.
                 $set("compoundName", comp.name);
@@ -198,11 +202,13 @@
             var pointChildren = this.getPointChildren();
             var childPointIds = new Array();
             var sel;
-            for (var i=0; i<pointChildren.length; i++)
+            for (let i=0; i<pointChildren.length; i++) {
+                let pointId = $get("compoundPointSelect"+ pointChildren[i].id);
                 childPointIds.push({
 					key: pointChildren[i].id, 
-					value: $get("compoundPointSelect"+ pointChildren[i].id)
+					value: convertToInt(pointId)
 				});
+			}
 			switch(this.component.defName) {
 				case 'simpleCompound':
 					ViewDwr.saveSimpleCompoundComponent(this.component.id, 
@@ -258,7 +264,10 @@
 					);
                 	dygraphsCharts[compoundEditor.component.id].requestData();
                 }
-                
+
+                compoundEditor.setPointList(response.data.pointList);
+                compoundEditor.updatePointLists();
+
                 compoundEditor.close();
                 MiscDwr.notifyLongPoll(mango.longPoll.pollSessionId);
             }
@@ -338,34 +347,22 @@
 						}						
 					} else if (options.cellNum % 2 == 1)
 						td.className = "formField";
-						return td;
-					}
+                    return td;
+                }
 			});
 
-				// Add options to the controls.
-			var sel, p;
-			for (var i = 0; i < pointChildren.length; i++) {
-				sel = $("compoundPointSelect" + pointChildren[i].id);
+            this.targetPointSelects = [];
+			for (let i = 0; i < pointChildren.length; i++) {
 				var pointChildId = "compoundPointSelect"+ pointChildren[i].id;
-				sel = $(pointChildId);
-				sel.options[0] = new Option("", 0);
-				for (p = 0; p < this.pointList.length; p++) {
-					if (contains(pointChildren[i].dataTypes, this.pointList[p].dataType)) {
-						sel.options[sel.options.length] = new Option(
-							settingsEditor.pointList[p].name,
-							settingsEditor.pointList[p].id
-						);
-					}
-				}
+				var dataPointId = pointChildren[i].viewComponent.dataPointId;
+
+				this.targetPointSelects[this.targetPointSelects.length] = new DataPointsSelect({
+                    selectHtmlId: pointChildId,
+                    placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                    pointsArray: this.pointList.filter((point) => point.id == dataPointId),
+                    dataTypes: this.component ? (this.component.supportedDataTypes || []) : []
+                });
 
-				// Set the control default value.
-				$set(sel, pointChildren[i].viewComponent.dataPointId);
-				jQuery("#" + pointChildId).chosen({
-					allow_single_deselect: true,
-					placeholder_text_single: " ",
-					search_contains: true,
-					width: "400px"
-				});
 				if(this.component.defName === "enhancedImageChart") {	
 					jQuery("#compoundPointColor" + pointChildren[i].id).jPicker({
 						images: {
diff --git a/WebContent/WEB-INF/jsp/include/settingsEditor.jsp b/WebContent/WEB-INF/jsp/include/settingsEditor.jsp
index 84ad9df6d4..091502f30e 100644
--- a/WebContent/WEB-INF/jsp/include/settingsEditor.jsp
+++ b/WebContent/WEB-INF/jsp/include/settingsEditor.jsp
@@ -16,8 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see http://www.gnu.org/licenses/.
 --%>
-<link href="resources/jQuery/plugins/chosen/chosen.min.css" rel="stylesheet" type="text/css"/>	
-<script type="text/javascript" src="resources/jQuery/plugins/chosen/chosen.jquery.min.js"></script>
 <%@ include file="/WEB-INF/jsp/include/tech.jsp" %>
 <div id="settingsEditorPopup" style="display:none;left:0px;top:0px;" class="windowDiv">
   <div>
@@ -37,7 +35,7 @@
     <table>
       <tr>
         <td class="formLabelRequired"><spring:message code="viewEdit.settings.point"/></td>
-        <td class="formField"><select id="settingsPointList" onchange="settingsEditor.pointSelectChanged()"></select></td>
+        <td class="formField"><select id="settingsPointList" onchange="settingsEditor.pointSelectChanged(this.value)" style="display:none;"></select></td>
       </tr>
       <tr>
         <td class="formLabel"><spring:message code="viewEdit.settings.nameOverride"/></td>
@@ -75,18 +73,23 @@
     function SettingsEditor() {
         this.componentId = null;
         this.pointList = [];
-        
+        this.dataPointsSelect;
+
         this.open = function(compId) {
             document.getElementById("settingsEditorPopup").firstElementChild.setAttribute("id", "settings" + compId);
             settingsEditor.componentId = compId;
             
-            ViewDwr.getViewComponent(compId, viewId, function(comp) {
-            	
+            ViewDwr.getViewComponentResponse(compId, viewId, function(response) {
+            	let comp = response.data.comp;
                 $set("settingsComponentName", comp.displayName);
-                
-                // Update the point list
-                settingsEditor.updatePointList(comp.supportedDataTypes);
-                
+
+                settingsEditor.dataPointsSelect = new DataPointsSelect({
+                    selectHtmlId: "settingsPointList",
+                    placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                    pointsArray: response.data.pointList.filter((point) => point.id == comp.dataPointId),
+                    dataTypes: comp.supportedDataTypes
+                });
+
                 // Update the data in the form.
                 $set("settingsPointList", comp.dataPointId);
                 $set("settingsPointName", comp.nameOverride);
@@ -95,16 +98,8 @@
                 $set("settingsControls", comp.displayControls);                
                 $set("settingsPositionX", comp.x);
                 $set("settingsPositionY", comp.y);
-                
-                settingsEditor.pointSelectChanged();
-                
-                jQuery("#settingsPointList").chosen({
-            		placeholder_text_single: " ",
-            		search_contains: true,
-            		width: "600px"
-            	});
-                
-                jQuery("#settingsPointList").trigger('chosen:updated');
+
+                settingsEditor.pointSelectChanged(comp.dataPointId);
 
                 positionEditor(compId, "settingsEditorPopup");
                 show("settingsEditorPopup");
@@ -124,7 +119,7 @@
             updatePointPosition(settingsEditor.componentId,
               posX, posY, "settingsPositionX", "settingsPositionY"
             );
-            ViewDwr.setPointComponentSettings(settingsEditor.componentId, $get("settingsPointList"),
+            ViewDwr.setPointComponentSettings(settingsEditor.componentId, this.dataPointsSelect.getPointId(),
                     $get("settingsPointName"), $get("settingsSettable"), $get("settingsBkgdColor"),
                     $get("settingsControls"), posX, posY, viewId, function(response) {
                 if (response.hasMessages) {
@@ -138,30 +133,26 @@
         };
         
         this.setPointList = function(pointList) {
-            settingsEditor.pointList = pointList;
+            this.dataPointsSelect.setPointsArray(pointList);
         };
-        
-        this.pointSelectChanged = function() {
-            var point = getElement(settingsEditor.pointList, $get("settingsPointList"));
-            if (!point || !point.settable) {
-                $set("settingsSettable", false);
-                $("settingsSettable").disabled = true;
+
+        this.setDataTypes = function(dataTypes) {
+            if(dataTypes) {
+                this.dataPointsSelect.setDataTypes(dataTypes);
             }
-            else
-                $("settingsSettable").disabled = false;
         };
         
-        this.updatePointList = function(dataTypes) {
-            dwr.util.removeAllOptions("settingsPointList");
-            		
-            for (i=0; i<settingsEditor.pointList.length; i++) {
-				if (contains(dataTypes, settingsEditor.pointList[i].dataType)) {
-				jQuery("#settingsPointList").append( new Option(
-							settingsEditor.pointList[i].name,
-							settingsEditor.pointList[i].id) );
-				}
-			}
-            jQuery("#settingsPointList").append( new Option('',-1) );
+        this.pointSelectChanged = function(dataPointId) {
+            if(dataPointId > 0) {
+                var point = this.dataPointsSelect.getPointById(dataPointId);
+                if (!point || !point.settable) {
+                    $set("settingsSettable", false);
+                    $("settingsSettable").disabled = true;
+                } else {
+                    $("settingsSettable").disabled = false;
+                }
+            }
+
         };
     }
     var settingsEditor = new SettingsEditor();
diff --git a/WebContent/WEB-INF/jsp/pointEdit/pointName.jsp b/WebContent/WEB-INF/jsp/pointEdit/pointName.jsp
index fb701785f0..f52077ac50 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/pointName.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/pointName.jsp
@@ -39,19 +39,21 @@
   function doSaveForm() {
       document.forms[0].submit();
   }
-  jQuery(document).ready(function(){
-	  (function($) {
-			loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css"); 	
-			loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-	  	})(jQuery);	  
-  });
   window.onload = function() {
-	  jQuery("#allPointsList").chosen({
-	      	allow_single_deselect: true,
-			placeholder_text_single: " ",
-			search_contains: true,
-			width: "400px"
-	  });
+
+    let point = {
+        id : "<c:out value="${form.id}"/>",
+        name : "<c:out value="${form.extendedName}"/>",
+        xid : "<c:out value="${form.xid}"/>",
+        dataType : "<sst:i18n message="${form.dataTypeMessage}"/>"
+    }
+
+    let datPointDetailsPointSelect = new DataPointsSelect({
+        placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+        pointsArray: [point],
+        invisibleEmptyOption: true,
+        imgAddHtmlIds: ["bullet_go_left", "bullet_go"]
+    });
   }
 </script>
 
@@ -68,20 +70,17 @@
     </td>
     <td valign="top" align="right">
       <spring:message code="pointEdit.name.goto"/>:&nbsp;
-      <sst:select id="allPointsList" value="${form.id}" onchange="window.location='data_point_edit.shtm?dpid='+ this.value;">
-        <c:forEach items="${userPoints}" var="point">
-          <sst:option value="${point.id}"><c:out value="${point.extendedName}"/></sst:option>
-        </c:forEach>
-      </sst:select>
-      
+      <select id="allPointsList" value="${form.id}" onchange="window.location='data_point_edit.shtm?dpid='+ this.value;" style="display:none;">
+      </select>
+
       <c:if test="${!empty prevId}">
-        <tag:img png="bullet_go_left" title="pagination.previous"
-                onclick="window.location='data_point_edit.shtm?dpid=${prevId}'"/>
+        <tag:img id="bullet_go_left" png="bullet_go_left" title="pagination.previous"
+                onclick="window.location='data_point_edit.shtm?dpid=${prevId}'" style="display:none;"/>
       </c:if>
       
       <c:if test="${!empty nextId}">
-        <tag:img png="bullet_go" title="pagination.next"
-                onclick="window.location='data_point_edit.shtm?dpid=${nextId}'"/>
+        <tag:img id="bullet_go" png="bullet_go" title="pagination.next"
+                onclick="window.location='data_point_edit.shtm?dpid=${nextId}'" style="display:none;"/>
       </c:if>
     </td>
   </tr>
diff --git a/WebContent/WEB-INF/jsp/pointLinks.jsp b/WebContent/WEB-INF/jsp/pointLinks.jsp
index 1ca2b832d4..32c008f49a 100644
--- a/WebContent/WEB-INF/jsp/pointLinks.jsp
+++ b/WebContent/WEB-INF/jsp/pointLinks.jsp
@@ -23,33 +23,16 @@
 
 <tag:page dwr="PointLinksDwr" onload="init">
   <script type="text/javascript">
-    var sourcePoints;
     var editingPointLink;
+    var sourcePointSelect;
+    var targetPointSelect;
     
     function init() {
         PointLinksDwr.init(function(response) {
-            sourcePoints = response.sourcePoints;
-            
-            // Add points to source and target selects
-            dwr.util.addOptions("sourcePointId", response.sourcePoints, "key", "value");
-            jQuery("#sourcePointId").chosen({
-                allow_single_deselect: true,
-                placeholder_text_single: "<spring:message code='chosen.selector.selectPoint'/>",
-                search_contains: true,
-                width: "100%"
-            });
-            dwr.util.addOptions("targetPointId", response.targetPoints, "key", "value");
-            jQuery("#targetPointId").chosen({
-              allow_single_deselect: true,
-              placeholder_text_single: "<spring:message code='chosen.selector.selectPoint'/>",
-              search_contains: true,
-              width: "100%"
-            });
 
-          // Create the list of existing links
-            for (var i=0; i<response.pointLinks.length; i++) {
-                appendPointLink(response.pointLinks[i].id);
-                updatePointLink(response.pointLinks[i]);
+            for (var i=0; i<response.data.pointLinks.length; i++) {
+                appendPointLink(response.data.pointLinks[i].id);
+                updatePointLink(response.data.pointLinks[i], response.data);
             }
             
             <c:if test="${!empty param.plid}">
@@ -61,22 +44,33 @@
     function showPointLink(plId) {
         if (editingPointLink)
             stopImageFader($("pl"+ editingPointLink.id +"Img"));
-        PointLinksDwr.getPointLink(plId, function(pl) {
+        PointLinksDwr.getPointLinkResponse(plId, function(response) {
+            let pl = response.data.pointLink;
             if (!editingPointLink)
                 show("pointLinkDetails");
             editingPointLink = pl;
             
             $set("xid", pl.xid);
-            $set("sourcePointId", pl.sourcePointId);
-            $set("targetPointId", pl.targetPointId);
             $set("script", pl.script);
             $set("event", pl.event);
             $set("disabled", pl.disabled);
 
-          jQuery("#sourcePointId").trigger("chosen:updated");
-          jQuery("#targetPointId").trigger("chosen:updated");
+            sourcePointSelect = new DataPointsSelect({
+                selectHtmlId: "sourcePointId",
+                placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                pointsArray: response.data.sourcePoints.filter((point) => point.id == pl.sourcePointId)
+            });
 
-          setUserMessage();
+            targetPointSelect = new DataPointsSelect({
+                selectHtmlId: "targetPointId",
+                placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                pointsArray: response.data.targetPoints.filter((point) => point.id == pl.targetPointId),
+                pointSettable: true
+            });
+
+            setUserMessage();
+            sourcePointSelect.setPointId(pl.sourcePointId);
+            targetPointSelect.setPointId(pl.targetPointId);
         });
         startImageFader($("pl"+ plId +"Img"));
         display("deletePointLinkImg", plId != ${NEW_ID});
@@ -84,7 +78,25 @@
     
     function savePointLink() {
         setUserMessage();
-        hideContextualMessages("pointLinkDetails")
+        hideContextualMessages("pointLinkDetails");
+        let sourcePointId = $get("sourcePointId");
+        let targetPointId = $get("targetPointId");
+
+        let sourcePointIdUndefined = !sourcePointId || sourcePointId == 'undefined';
+        let targetPointIdUndefined = !targetPointId || targetPointId == 'undefined';
+
+        if(sourcePointIdUndefined || targetPointIdUndefined) {
+            if(sourcePointIdUndefined) {
+                let message = createValidationMessage("sourcePointId","<spring:message code="pointLinks.validate.sourceRequired"/>");
+                showDwrMessages([message]);
+            }
+            if(targetPointIdUndefined) {
+                let message = createValidationMessage("targetPointId","<spring:message code="pointLinks.validate.targetRequired"/>");
+                showDwrMessages([message]);
+            }
+            return;
+        }
+
         PointLinksDwr.savePointLink(editingPointLink.id, $get("xid"), $get("sourcePointId"), $get("targetPointId"),
                 $get("script"), $get("event"), $get("disabled"), function(response) {
             if (response.hasMessages)
@@ -100,7 +112,7 @@
                 }
                 else
                     setUserMessage("<spring:message code="pointLinks.pointLinkSaved"/>");
-                PointLinksDwr.getPointLink(editingPointLink.id, updatePointLink);
+                PointLinksDwr.getPointLinkResponse(editingPointLink.id, function(response) {updatePointLink(response.data.pointLink, response.data)});
             }
         });
     }
@@ -118,15 +130,15 @@
         createFromTemplate("pl_TEMPLATE_", plId, "pointLinksTable");
     }
     
-    function updatePointLink(pl) {
-        $set("pl"+ pl.id +"Name", getPointName(pl.sourcePointId) +' <tag:img png="bullet_go"/> '+ getPointName(pl.targetPointId));
+    function updatePointLink(pl, data) {
+        $set("pl"+ pl.id +"Name", getPointName(pl.sourcePointId, data.sourcePoints) +' <tag:img png="bullet_go"/> '+ getPointName(pl.targetPointId, data.targetPoints));
         setPointLinkImg(pl.disabled, $("pl"+ pl.id +"Img"));
     }
     
-    function getPointName(pointId) {
+    function getPointName(pointId, sourcePoints) {
         for (var i=0; i<sourcePoints.length; i++) {
-            if (sourcePoints[i].key == pointId)
-                return sourcePoints[i].value;
+            if (sourcePoints[i].id == pointId)
+                return sourcePoints[i].name;
         }
         return null;
     }
@@ -146,12 +158,20 @@
             showDwrMessages(response.messages);
         });
     }
-    jQuery(document).ready(function(){
-        (function($) {
-            loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-            loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-        })(jQuery);
-    });
+
+    function sourcePointSelectChanged() {
+        let sourcePoint = sourcePointSelect.getPoint();
+
+        if (!sourcePoint) {
+            console.error("Data integrity error: Source point not found for pointLink");
+            setUserMessage("<spring:message code='validate.invalidValue'/>");
+            return;
+        }
+
+        targetPointSelect.setPointId(undefined);
+        targetPointSelect.updatePointsList([sourcePoint]);
+        targetPointSelect.loadPointsList();
+    }
   </script>
   
   <table class="subPageHeader">
@@ -199,12 +219,12 @@
             
             <tr>
               <td class="formLabelRequired"><spring:message code="pointLinks.source"/></td>
-              <td class="formField"><select id="sourcePointId"></select></td>
+              <td class="formField"><select id="sourcePointId" onchange="sourcePointSelectChanged()" style="display:none;"></select></td>
             </tr>
             
             <tr>
               <td class="formLabelRequired"><spring:message code="pointLinks.target"/></td>
-              <td class="formField"><select id="targetPointId"></select></td>
+              <td class="formField"><select id="targetPointId" style="display:none;"></select></td>
             </tr>
             
             <tr>
diff --git a/WebContent/WEB-INF/jsp/publisherEdit/editHttpSender.jsp b/WebContent/WEB-INF/jsp/publisherEdit/editHttpSender.jsp
index 54a80b122b..1bd9ad3804 100644
--- a/WebContent/WEB-INF/jsp/publisherEdit/editHttpSender.jsp
+++ b/WebContent/WEB-INF/jsp/publisherEdit/editHttpSender.jsp
@@ -21,8 +21,8 @@
 <script type="text/javascript">
   var staticHeaderList;
   var staticParameterList = new Array();
-  var allPoints = new Array();  
-  var selectedPoints = new Array();  
+  var allPoints = new Array();
+  var pointsContext;
   
   function init() {
       PublisherEditDwr.initSender(initCB);
@@ -31,35 +31,28 @@
   dojo.addOnLoad(init);
 
   function initCB(response) {
-      var i;
-      var list = response.data.allPoints;
-      for (var i=0; i<list.length; i++)
-          allPoints[allPoints.length] = {
-                  id: list[i].id, name: list[i].extendedName, enabled: list[i].enabled, type: list[i].dataTypeMessage};
+      let list;
 
       staticHeaderList = new Array();
       list = response.data.publisher.staticHeaders;
-      for (i=0; i<list.length; i++)
+      for (let i=0; i<list.length; i++)
           staticHeaderList[staticHeaderList.length] = {key: list[i].key, value: list[i].value};
       refreshStaticHeaderList();
       
       list = response.data.publisher.staticParameters;
-      for (i=0; i<list.length; i++)
+      for (let i=0; i<list.length; i++)
           staticParameterList[staticParameterList.length] = {key: list[i].key, value: list[i].value};
       refreshStaticParameterList();
-      
-      list = response.data.publisher.points;
-      for (i=0; i<list.length; i++)
-          addToSelectedArray(list[i].dataPointId, list[i].parameterName, list[i].includeTimestamp);
-      refreshSelectedPoints();
+
       PublisherEditDwr.getBasicCredentials(staticHeaderList, setCredentials);
       PublisherEditDwr.getIsUseJSON(setUseJSON);
-      jQuery("#availablePoints").chosen({
-          allow_single_deselect: true,
-          placeholder_text_single: "<spring:message code='chosen.selector.selectPoint'/>",
-          search_contains: true,
-          width: "100%"
-      });
+
+      pointsContext = new SenderPointsContext(new DataPointsSelect({
+           selectHtmlId: "availablePoints",
+           placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+           excludePointsArray: response.data.publisher.points,
+           pointsArray: response.data.selectedPoints
+      }), "selectedPoints");
   }
 
   function initStaticHeaders(response) {
@@ -174,101 +167,7 @@
   }
   
   function selectPoint() {
-      var pointId = $get("availablePoints");
-      addToSelectedArray(pointId, null, true);
-      refreshSelectedPoints();
-  }
-  
-  function addToSelectedArray(pointId, parameterName, includeTimestamp) {
-      var data = getElement(allPoints, pointId);
-      
-      if (parameterName == null)
-          parameterName = data.name;
-      
-      if (data) {
-          // Missing names imply that the point was deleted, so ignore.
-          selectedPoints[selectedPoints.length] = {
-              id : pointId,
-              pointName : data.name,
-              enabled : data.enabled,
-              pointType : data.type,
-              parameterName: parameterName,
-              includeTimestamp: includeTimestamp
-          };
-      }
-  }
-  
-  function removeFromSelectedPoints(pointId) {
-      removeElement(selectedPoints, pointId);
-      refreshSelectedPoints();
-  }
-  
-  function refreshSelectedPoints() {
-      dwr.util.removeAllRows("selectedPoints");
-      if (selectedPoints.length == 0)
-          show("selectedPointsEmpty");
-      else {
-          hide("selectedPointsEmpty");
-          dwr.util.addRows("selectedPoints", selectedPoints,
-              [
-                  function(data) { return data.pointName; },
-                  function(data) { return "<img src='images/"+ (data.enabled ? "brick_go" : "brick_stop") +".png'/>"; },
-                  function(data) { return data.pointType; },
-                  function(data) {
-                          return "<input type='text' value='"+ data.parameterName +"' "+
-                                  "onblur='updateParameterName("+ data.id +", this.value)'/>";
-                  },
-                  function(data) {
-                          return "<input type='checkbox' "+ (data.includeTimestamp ? "checked='checked' " : "") +
-                                  "onclick='updateIncludeTimestamp("+ data.id +", this.checked)'/>";
-                  },
-                  function(data) { 
-                          return "<img src='images/bullet_delete.png' class='ptr' "+
-                                  "onclick='removeFromSelectedPoints("+ data.id +")'/>";
-                  }
-              ],
-              {
-                  rowCreator: function(options) {
-                      var tr = document.createElement("tr");
-                      tr.className = "row"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
-                      return tr;
-                  },
-                  cellCreator: function(options) {
-                      var td = document.createElement("td");
-                      if (options.cellNum == 1 || options.cellNum == 4)
-                          td.align = "center";
-                      return td;
-                  } 
-              });
-      }
-      refreshAvailablePoints();
-  }
-  
-  function refreshAvailablePoints() {
-      dwr.util.removeAllOptions("availablePoints");
-      var availPoints = new Array();
-      for (var i=0; i<allPoints.length; i++) {
-          var found = false;
-          for (var j=0; j<selectedPoints.length; j++) {
-              if (selectedPoints[j].id == allPoints[i].id) {
-                  found = true;
-                  break;
-              }
-          }
-          
-          if (!found)
-              availPoints[availPoints.length] = allPoints[i];
-      }
-      dwr.util.addOptions("availablePoints", availPoints, "id", "name");
-      jQuery("#availablePoints").trigger("chosen:updated");
-  }
-  
-  function updateParameterName(pointId, parameterName) {
-      updateElement(selectedPoints, pointId, "parameterName", parameterName);
-  }
-  
-  function updateIncludeTimestamp(pointId, includeTimestamp) {
-      updateElement(selectedPoints, pointId, "includeTimestamp", includeTimestamp);
+      pointsContext.addPointToContext();
   }
   
   function savePublisherImpl(name, xid, enabled, cacheWarningSize, changesOnly, sendSnapshot, snapshotSendPeriods,
@@ -277,10 +176,7 @@
       hide("urlMsg");
       hide("pointsMsg");
       
-      var points = new Array();
-      for (var i=0; i<selectedPoints.length; i++)
-          points[points.length] = {dataPointId: selectedPoints[i].id, parameterName: selectedPoints[i].parameterName,
-                  includeTimestamp: selectedPoints[i].includeTimestamp};
+      let points = pointsContext.convertToSave();
 
       updateStaticHeadersList();
 
@@ -383,12 +279,6 @@
   function showHttpSenderTest() {
       document.getElementById("httpSenderTest").style.visibility = "visible";
   }
-  jQuery(document).ready(function(){
-      (function($) {
-          loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-          loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-      })(jQuery);
-  });
 </script>
 
 <table id="publisherEditor" cellpadding="0" cellspacing="0">
@@ -501,8 +391,8 @@
       <tr>
         <td class="smallTitle"><spring:message code="publisherEdit.points"/></td>
         <td align="right">
-          <select id="availablePoints"></select>
-          <tag:img png="icon_comp_add" onclick="selectPoint()"/>
+          <select id="availablePoints" style="display:none;"></select>
+          <tag:img id="icon_comp_add" png="icon_comp_add" onclick="selectPoint()" style="display:none;"/>
         </td>
       </tr>
     </table>
@@ -510,6 +400,7 @@
     <table cellspacing="1" cellpadding="0">
       <tr class="rowHeader">
         <td><spring:message code="publisherEdit.point.name"/></td>
+        <td><spring:message code="publisherEdit.point.xid"/></td>
         <td><spring:message code="publisherEdit.point.status"/></td>
         <td><spring:message code="publisherEdit.point.type"/></td>
         <td><spring:message code="publisherEdit.httpSender.point.param"/></td>
diff --git a/WebContent/WEB-INF/jsp/publisherEdit/editPachube.jsp b/WebContent/WEB-INF/jsp/publisherEdit/editPachube.jsp
index bd9c9742a2..5cb4384e86 100644
--- a/WebContent/WEB-INF/jsp/publisherEdit/editPachube.jsp
+++ b/WebContent/WEB-INF/jsp/publisherEdit/editPachube.jsp
@@ -19,122 +19,21 @@
 <%@ include file="/WEB-INF/jsp/include/tech.jsp" %>
 <script type="text/javascript">
   var allPoints = new Array();  
-  var selectedPoints = new Array();  
+  var pointsContext;
   
-  dojo.addOnLoad(function() { 
+  dojo.addOnLoad(function() {
       PublisherEditDwr.initSender(function(response) {
-          var i;
-          var list = response.data.allPoints;
-          for (var i=0; i<list.length; i++)
-              allPoints[allPoints.length] = {
-                      id: list[i].id, name: list[i].extendedName, enabled: list[i].enabled, type: list[i].dataTypeMessage};
-              
-          list = response.data.publisher.points;
-          for (i=0; i<list.length; i++)
-              addToSelectedArray(list[i].dataPointId, list[i].feedId, list[i].dataStreamId);
-          refreshSelectedPoints();
-          jQuery("#availablePoints").chosen({
-              allow_single_deselect: true,
-              placeholder_text_single: "<spring:message code='chosen.selector.selectPoint'/>",
-              search_contains: true,
-              width: "100%"
-          });
+          pointsContext = new PachubePointsContext(new DataPointsSelect({
+              selectHtmlId: "availablePoints",
+              placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+              excludePointsArray: response.data.publisher.points,
+              pointsArray: response.data.selectedPoints
+          }), "selectedPoints");
       });
   });
   
   function selectPoint() {
-      var pointId = $get("availablePoints");
-      addToSelectedArray(pointId, "", "");
-      refreshSelectedPoints();
-  }
-  
-  function addToSelectedArray(pointId, feedId, dataStreamId) {
-      var data = getElement(allPoints, pointId);
-      
-      if (data) {
-          // Missing names imply that the point was deleted, so ignore.
-          selectedPoints[selectedPoints.length] = {
-              id : pointId,
-              pointName : data.name,
-              enabled : data.enabled,
-              pointType : data.type,
-              feedId: feedId,
-              dataStreamId: dataStreamId
-          };
-      }
-  }
-  
-  function removeFromSelectedPoints(pointId) {
-      removeElement(selectedPoints, pointId);
-      refreshSelectedPoints();
-  }
-  
-  function refreshSelectedPoints() {
-      dwr.util.removeAllRows("selectedPoints");
-      if (selectedPoints.length == 0)
-          show("selectedPointsEmpty");
-      else {
-          hide("selectedPointsEmpty");
-          dwr.util.addRows("selectedPoints", selectedPoints,
-              [
-                  function(data) { return data.pointName; },
-                  function(data) { return "<img src='images/"+ (data.enabled ? "brick_go" : "brick_stop") +".png'/>"; },
-                  function(data) { return data.pointType; },
-                  function(data) {
-                          return "<input type='text' value='"+ data.feedId +"' "+
-                                  "onblur='updateFeedId("+ data.id +", this.value)'/>";
-                  },
-                  function(data) {
-                	      return "<input type='text' value='"+ data.dataStreamId +"' "+
-                                  "onblur='updateDataStreamId("+ data.id +", this.value)'/>";
-                  },
-                  function(data) { 
-                          return "<img src='images/bullet_delete.png' class='ptr' "+
-                                  "onclick='removeFromSelectedPoints("+ data.id +")'/>";
-                  }
-              ],
-              {
-                  rowCreator: function(options) {
-                      var tr = document.createElement("tr");
-                      tr.className = "row"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
-                      return tr;
-                  },
-                  cellCreator: function(options) {
-                      var td = document.createElement("td");
-                      if (options.cellNum == 1 || options.cellNum == 4)
-                          td.align = "center";
-                      return td;
-                  } 
-              });
-      }
-      refreshAvailablePoints();
-  }
-  
-  function refreshAvailablePoints() {
-      dwr.util.removeAllOptions("availablePoints");
-      var availPoints = new Array();
-      for (var i=0; i<allPoints.length; i++) {
-          var found = false;
-          for (var j=0; j<selectedPoints.length; j++) {
-              if (selectedPoints[j].id == allPoints[i].id) {
-                  found = true;
-                  break;
-              }
-          }
-          
-          if (!found)
-              availPoints[availPoints.length] = allPoints[i];
-      }
-      dwr.util.addOptions("availablePoints", availPoints, "id", "name");
-      jQuery("#availablePoints").trigger("chosen:updated");
-  }
-  
-  function updateFeedId(pointId, feedId) {
-      updateElement(selectedPoints, pointId, "feedId", feedId);
-  }
-  
-  function updateDataStreamId(pointId, dataStreamId) {
-      updateElement(selectedPoints, pointId, "dataStreamId", dataStreamId);
+      pointsContext.addPointToContext();
   }
   
   function savePublisherImpl(name, xid, enabled, cacheWarningSize, changesOnly, sendSnapshot, snapshotSendPeriods,
@@ -145,21 +44,12 @@
       hide("retriesMsg");
       hide("pointsMsg");
       
-      var points = new Array();
-      for (var i=0; i<selectedPoints.length; i++)
-          points[points.length] = {dataPointId: selectedPoints[i].id, feedId: selectedPoints[i].feedId,
-                  dataStreamId: selectedPoints[i].dataStreamId};
+      let points = pointsContext.convertToSave();
       
       PublisherEditDwr.savePachubeSender(name, xid, enabled, points, $get("apiKey"), $get("timeoutSeconds"),
               $get("retries"), cacheWarningSize, changesOnly, sendSnapshot, snapshotSendPeriods, snapshotSendPeriodType,
               savePublisherCB);
   }
-  jQuery(document).ready(function(){
-    (function($) {
-      loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-      loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-    })(jQuery);
-  });
 </script>
 
 <table cellpadding="0" cellspacing="0">
@@ -206,8 +96,8 @@
       <tr>
         <td class="smallTitle"><spring:message code="publisherEdit.points"/></td>
         <td align="right">
-          <select id="availablePoints"></select>
-          <tag:img png="icon_comp_add" onclick="selectPoint()"/>
+          <select id="availablePoints" style="display:none;"></select>
+          <tag:img id="icon_comp_add" png="icon_comp_add" onclick="selectPoint()" style="display:none;"/>
         </td>
       </tr>
     </table>
@@ -215,6 +105,7 @@
     <table cellspacing="1" cellpadding="0">
       <tr class="rowHeader">
         <td><spring:message code="publisherEdit.point.name"/></td>
+        <td><spring:message code="publisherEdit.point.xid"/></td>
         <td><spring:message code="publisherEdit.point.status"/></td>
         <td><spring:message code="publisherEdit.point.type"/></td>
         <td><spring:message code="publisherEdit.pachube.point.feedId"/></td>
diff --git a/WebContent/WEB-INF/jsp/publisherEdit/editPersistent.jsp b/WebContent/WEB-INF/jsp/publisherEdit/editPersistent.jsp
index 99c3bfecf1..5bf4e7bc4f 100644
--- a/WebContent/WEB-INF/jsp/publisherEdit/editPersistent.jsp
+++ b/WebContent/WEB-INF/jsp/publisherEdit/editPersistent.jsp
@@ -20,104 +20,21 @@
 
 <%@page import="com.serotonin.mango.vo.publish.persistent.PersistentSenderVO"%><script type="text/javascript">
   var allPoints = new Array();  
-  var selectedPoints = new Array();  
+  var pointsContext;
   
   dojo.addOnLoad(function() { 
       PublisherEditDwr.initSender(function(response) {
-          var i;
-          var list = response.data.allPoints;
-          for (var i=0; i<list.length; i++)
-              allPoints[allPoints.length] = {
-                      id: list[i].id, name: list[i].extendedName, enabled: list[i].enabled, type: list[i].dataTypeMessage};
-              
-          list = response.data.publisher.points;
-          for (i=0; i<list.length; i++)
-              addToSelectedArray(list[i].dataPointId);
-          refreshSelectedPoints();
-          jQuery("#availablePoints").chosen({
-              allow_single_deselect: true,
-              placeholder_text_single: "<spring:message code='chosen.selector.selectPoint'/>",
-              search_contains: true,
-              width: "100%"
-          });
+          pointsContext = new PersistentPointsContext(new DataPointsSelect({
+              selectHtmlId: "availablePoints",
+              placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+              excludePointsArray: response.data.publisher.points,
+              pointsArray: response.data.selectedPoints
+          }), "selectedPoints");
       });
   });
   
   function selectPoint() {
-      var pointId = $get("availablePoints");
-      addToSelectedArray(pointId);
-      refreshSelectedPoints();
-  }
-  
-  function addToSelectedArray(pointId) {
-      var data = getElement(allPoints, pointId);
-      
-      if (data) {
-          // Missing names imply that the point was deleted, so ignore.
-          selectedPoints[selectedPoints.length] = {
-              id : pointId,
-              pointName : data.name,
-              enabled : data.enabled,
-              pointType : data.type
-          };
-      }
-  }
-  
-  function removeFromSelectedPoints(pointId) {
-      removeElement(selectedPoints, pointId);
-      refreshSelectedPoints();
-  }
-  
-  function refreshSelectedPoints() {
-      dwr.util.removeAllRows("selectedPoints");
-      if (selectedPoints.length == 0)
-          show("selectedPointsEmpty");
-      else {
-          hide("selectedPointsEmpty");
-          dwr.util.addRows("selectedPoints", selectedPoints,
-              [
-                  function(data) { return data.pointName; },
-                  function(data) { return "<img src='images/"+ (data.enabled ? "brick_go" : "brick_stop") +".png'/>"; },
-                  function(data) { return data.pointType; },
-                  function(data) { 
-                          return "<img src='images/bullet_delete.png' class='ptr' "+
-                                  "onclick='removeFromSelectedPoints("+ data.id +")'/>";
-                  }
-              ],
-              {
-                  rowCreator: function(options) {
-                      var tr = document.createElement("tr");
-                      tr.className = "row"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
-                      return tr;
-                  },
-                  cellCreator: function(options) {
-                      var td = document.createElement("td");
-                      if (options.cellNum == 1 || options.cellNum == 3)
-                          td.align = "center";
-                      return td;
-                  } 
-              });
-      }
-      refreshAvailablePoints();
-  }
-  
-  function refreshAvailablePoints() {
-      dwr.util.removeAllOptions("availablePoints");
-      var availPoints = new Array();
-      for (var i=0; i<allPoints.length; i++) {
-          var found = false;
-          for (var j=0; j<selectedPoints.length; j++) {
-              if (selectedPoints[j].id == allPoints[i].id) {
-                  found = true;
-                  break;
-              }
-          }
-          
-          if (!found)
-              availPoints[availPoints.length] = allPoints[i];
-      }
-      dwr.util.addOptions("availablePoints", availPoints, "id", "name");
-      jQuery("#availablePoints").trigger("chosen:updated");
+      pointsContext.addPointToContext();
   }
   
   function savePublisherImpl(name, xid, enabled, cacheWarningSize, changesOnly, sendSnapshot, snapshotSendPeriods,
@@ -127,21 +44,12 @@
       hide("portMsg");
       hide("pointsMsg");
       
-      var points = new Array();
-      for (var i=0; i<selectedPoints.length; i++)
-          points[points.length] = {dataPointId: selectedPoints[i].id};
+      let points = pointsContext.convertToSave();
       
       PublisherEditDwr.savePersistentSender(name, xid, enabled, points, $get("host"), $get("port"),
               $get("authorizationKey"), xid, $get("syncType"), cacheWarningSize, changesOnly, sendSnapshot,
               snapshotSendPeriods, snapshotSendPeriodType, savePublisherCB);
   }
-
-  jQuery(document).ready(function(){
-    (function($) {
-      loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-      loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-    })(jQuery);
-  });
 </script>
 
 <table cellpadding="0" cellspacing="0">
@@ -198,8 +106,8 @@
       <tr>
         <td class="smallTitle"><spring:message code="publisherEdit.points"/></td>
         <td align="right">
-          <select id="availablePoints"></select>
-          <tag:img png="icon_comp_add" onclick="selectPoint()"/>
+          <select id="availablePoints" style="display:none;"></select>
+          <tag:img id="icon_comp_add" png="icon_comp_add" onclick="selectPoint()" style="display:none;"/>
         </td>
       </tr>
     </table>
@@ -207,6 +115,7 @@
     <table cellspacing="1" cellpadding="0">
       <tr class="rowHeader">
         <td><spring:message code="publisherEdit.point.name"/></td>
+        <td><spring:message code="publisherEdit.point.xid"/></td>
         <td><spring:message code="publisherEdit.point.status"/></td>
         <td><spring:message code="publisherEdit.point.type"/></td>
         <td></td>
diff --git a/WebContent/WEB-INF/jsp/reports.jsp b/WebContent/WEB-INF/jsp/reports.jsp
index fd92eb1666..bdfe8cfc90 100644
--- a/WebContent/WEB-INF/jsp/reports.jsp
+++ b/WebContent/WEB-INF/jsp/reports.jsp
@@ -23,15 +23,13 @@
 
 <tag:page dwr="ReportsDwr" js="emailRecipients" onload="init">
   <script type="text/javascript">
-    var allPointsArray = new Array();
-    var reportPointsContext;
+    var pointsContext;
     var selectedReport;
     var emailRecipients;
     
     function init() {
         ReportsDwr.init(function(response) {
             hide("hourglass");
-            allPointsArray = response.data.points;
             
             emailRecipients = new mango.erecip.EmailRecipients("recipients",
                     "<spring:message code="reports.recipTestEmailMessage"/>", response.data.mailingLists, response.data.users);
@@ -45,22 +43,16 @@
             }
             
             <c:if test="${!empty param.wlid}">
-              ReportsDwr.createReportFromWatchlist(${param.wlid}, loadReportCB);
+              ReportsDwr.createReportFromWatchlistResponse(${param.wlid}, function(response) {loadReportCB(response.data.report, response.data.points)});
             </c:if>
         });
-        jQuery("#allPointsList").chosen({
-            allow_single_deselect: true,
-            placeholder_text_single: " ",
-            search_contains: true,
-            width: "400px"
-        });
     }
     
     function loadReport(reportId, copy) {
         if (selectedReport)
             stopImageFader("r"+ selectedReport.id +"Img");
         
-        ReportsDwr.getReport(reportId, copy, loadReportCB);
+        ReportsDwr.getReportResponse(reportId, copy, function(response) {loadReportCB(response.data.report, response.data.points)});
         
         if (copy)
             reportId = <c:out value="<%= Common.NEW_ID %>"/>;
@@ -70,7 +62,7 @@
         display("copyImg", reportId != <c:out value="<%= Common.NEW_ID %>"/>);
     }
     
-    function loadReportCB(report) {
+    function loadReportCB(report, points) {
         if (!report)
             return;
         if (!selectedReport)
@@ -78,8 +70,12 @@
         selectedReport = report;
         
         $set("name", report.name);
-        let handlePointsContext = new ReportPointsContext(report.points, allPointsArray);
-        setPointsContext(handlePointsContext);
+
+        pointsContext = new ReportPointsContext(new DataPointsSelect({
+            placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+            excludePointsArray: report.points,
+            pointsArray: points
+        }));
 
         $set("includeEvents", report.includeEvents);
         $set("includeUserComments", report.includeUserComments);
@@ -121,18 +117,6 @@
         updateEmailFields();
     }
 
-    function setPointsContext(reportPointsContext) {
-        this.reportPointsContext = reportPointsContext;
-    }
-    
-    function updatePointColour(pointId, colour) {
-        reportPointsContext.updatePoint(pointId, "colour", colour);
-    }
-    
-    function updatePointConsolidatedChart(pointId, consolidatedChart) {
-        reportPointsContext.updatePoint(pointId, "consolidatedChart", consolidatedChart);
-    }
-
     function updateReportInstancesList(instanceArray) {
         stopImageFader("reportInstancesRefreshImg");
         dwr.util.removeAllRows("reportInstancesList");
@@ -301,7 +285,7 @@
     
     function saveReport() {
         startImageFader("saveImg");
-        ReportsDwr.saveReport(selectedReport.id, $get("name"), reportPointsContext.convertToSave(), $get("includeEvents"),
+        ReportsDwr.saveReport(selectedReport.id, $get("name"), pointsContext.convertToSave(), $get("includeEvents"),
                 $get("includeUserComments"), $get("dateRangeType"), $get("relativeType"), $get("prevPeriodCount"),
                 $get("prevPeriodType"), $get("pastPeriodCount"), $get("pastPeriodType"), $get("fromNone"),
                 $get("fromYear"), $get("fromMonth"), $get("fromDay"), $get("fromHour"), $get("fromMinute"),
@@ -372,7 +356,7 @@
         if (hasImageFader("runImg"))
             return;
         
-        ReportsDwr.runReport($get("name"), reportPointsContext.convertToSave(), $get("includeEvents"),
+        ReportsDwr.runReport($get("name"), pointsContext.convertToSave(), $get("includeEvents"),
                 $get("includeUserComments"), $get("dateRangeType"), $get("relativeType"), $get("prevPeriodCount"),
                 $get("prevPeriodType"), $get("pastPeriodCount"), $get("pastPeriodType"), $get("fromNone"),
                 $get("fromYear"), $get("fromMonth"), $get("fromDay"), $get("fromHour"), $get("fromMinute"),
@@ -390,13 +374,6 @@
         });
         startImageFader("runImg");
     }
-
-    jQuery(document).ready(function(){
-        (function($) {
-            loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-            loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-        })(jQuery);
-    });
   </script>
   
   <table cellpadding="0" cellspacing="0"><tr><td>
@@ -486,8 +463,8 @@
             <tr>
               <td class="formLabelRequired"><spring:message code="common.points"/></td>
               <td class="formField">
-                <select id="allPointsList"></select>
-                <tag:img png="add" onclick="reportPointsContext.addPointToContext();" title="common.add"/>
+                <select id="allPointsList" style="display:none;"></select>
+                <tag:img id="icon_add" png="add" onclick="pointsContext.addPointToContext();" title="common.add" style="display:none;"/>
                 
                 <table cellspacing="1">
                   <tbody id="contextTableEmpty" style="display:none;">
diff --git a/WebContent/WEB-INF/jsp/scripting.jsp b/WebContent/WEB-INF/jsp/scripting.jsp
index f8e2fd48c0..06504d76e2 100644
--- a/WebContent/WEB-INF/jsp/scripting.jsp
+++ b/WebContent/WEB-INF/jsp/scripting.jsp
@@ -36,7 +36,7 @@
         payload.id = -1;
         payload.script = $get("script");
 
-        let toSave = this.scriptPointsContext.convertToSave();
+        let toSave = pointsContext.convertToSave();
         payload.pointsOnContext = convertPointsOnContext(toSave);
         payload.datapointContext = objectsContextArray[0] ? objectsContextArray[0].value : "";
         payload.datasourceContext = objectsContextArray[1] ? objectsContextArray[1].value : "";
@@ -59,40 +59,24 @@
         });
     };
 
-    var pointsArray = new Array();
-    var scriptPointsContext;
+    var pointsContext;
     var objectsContextArray = new Array();
 
     function init() {
         ScriptsDwr.getScripts(initCB);
-        getPointsCB();
-
         createContextualMessageNode("contextContainer", "context");
 
-        jQuery("#allPointsList").chosen({
-       		allow_single_deselect: true,
-			placeholder_text_single: " ",
-			search_contains: true,
-			width: "400px"
-		});
-    }
-
-    function getDataPointById(id) {
-        for(let i = 0; i < pointsArray.length; i++) {
-            if(pointsArray[i].id === id) {
-                return pointsArray[i];
-            }
-        }
-        return null;
+        document.getElementById("loader").style.display = "none";
+                    document.body.style.overflow="visible";
     }
 
     function convertPointsOnContext(toSave) {
         let pointsOnContext = [];
         for(let i = 0; i < toSave.length; i++) {
             let entry = toSave[i];
-            let dataPoint = getDataPointById(entry.key);
+            let dataPoint = pointsContext.getContextPointById(entry.key);
             if(dataPoint) {
-                let dataPointXid = dataPoint.xid;
+                let dataPointXid = dataPoint.xid ? dataPoint.xid : dataPoint.pointXid;
                 let varName = entry.value;
                 let object = {
                     dataPointXid: dataPointXid,
@@ -100,38 +84,13 @@
                 };
                 pointsOnContext[pointsOnContext.length] = object;
             } else {
-                throw new Error();
+                setUserMessage("<spring:message code="script.execute.error"/> ");
+                throw new Error('dataPoint is undefined!');
             }
         }
         return pointsOnContext;
     }
 
-    function getPointsCB()
-    {
-        jQuery.ajax({
-            type: "GET",
-        	dataType: "text",
-        	url:myLocation+urlGetDataPoints,
-        	success: function(points){
-            points = JSON.parse(points);
-            for(i = 0; i < points.length; i++) {
-                point = points[i];
-                pointsArray[i] = {
-                        "id":point.id,
-                        "name":point.extendName,
-                        "xid":point.xid,
-                        "type":point.dataType,
-                        };
-            }
-            document.getElementById("loader").style.display = "none";
-            document.body.style.overflow="visible";
-        	},
-        	error: function(XMLHttpRequest, textStatus, errorThrown) {
-        	  console.log(textStatus);
-        	}
-        });
-    }
-
     function initCB(scripts) {
     	for (var i=0; i<scripts.length; i++) {
             appendScript(scripts[i].id);
@@ -154,21 +113,24 @@
             stopImageFader($("se"+ editingScript.id +"Img"));
         hideContextualMessages("scriptDetails");
 
-        ScriptsDwr.getScript(seId, function(s) {
+        ScriptsDwr.getScriptResponse(seId, function(response) {
         	 if (!editingScript)
                  show($("scriptDetails"));
 
-            editingScript = s;
-            setValueInNode('xid', s.xid);
-            setValueInNode('name', s.name);
-            setValueInNode('script', s.script);
+            editingScript = response.data.script;
+            setValueInNode('xid', editingScript.xid);
+            setValueInNode('name', editingScript.name);
+            setValueInNode('script', editingScript.script);
 
-            let handlePointsContext = new ScriptPointsContext(s.pointsOnContext, pointsArray);
-            setPointsContext(handlePointsContext);
+            pointsContext = new ScriptPointsContext(new DataPointsSelect({
+                placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
+                excludePointsArray: editingScript.pointsOnContext,
+                pointsArray: response.data.dataPoints
+            }));
 
             clearObjectsTable();
-		 	for (var i=0; i<s.objectsOnContext.length; i++)
-		 		 objectsContextArray.push({key: s.objectsOnContext[i].key, value: s.objectsOnContext[i].value});
+		 	for (var i=0; i<editingScript.objectsOnContext.length; i++)
+		 		 objectsContextArray.push({key: editingScript.objectsOnContext[i].key, value: editingScript.objectsOnContext[i].value});
 
 	        writeObjectsContextArray();
 	        setUserMessage();
@@ -189,13 +151,9 @@
         }
     }
 
-    function setPointsContext(scriptPointsContext) {
-        this.scriptPointsContext = scriptPointsContext;
-    }
-
     function saveScript() {
         ScriptsDwr.saveScript(editingScript.id,$get("xid"), $get("name"),
-                $get("script"),this.scriptPointsContext.convertToSave(),objectsContextArray,
+                $get("script"),pointsContext.convertToSave(),objectsContextArray,
                 function(response) {
 		        	if (response.hasMessages)
 		                showDwrMessages(response.messages);
@@ -291,15 +249,6 @@
         else
             hide($("userMessage"));
     }
-
-    jQuery(document).ready(function(){
-    	(function($) {
-			loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-			loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-    	})(jQuery);
-    });
-
-
   </script>
 
   <style>body{ overflow:hidden;}</style>
@@ -360,8 +309,8 @@
             <tr>
 			    <td class="formLabelRequired"><spring:message code="scripts.pointsContext"/></td>
 			    <td class="formField">
-			      <select id="allPointsList"></select>
-			      <tag:img png="add" onclick="scriptPointsContext.addPointToContext();" title="common.add"/>
+			      <select id="allPointsList" style="display:none;"></select>
+			      <tag:img id="icon_add" png="add" onclick="pointsContext.addPointToContext();" title="common.add" style="display:none;"/>
 
 			      <table cellspacing="1" id="contextContainer">
 			        <tbody id="contextTableEmpty" style="display:none;">
diff --git a/WebContent/WEB-INF/jsp/viewEdit.jsp b/WebContent/WEB-INF/jsp/viewEdit.jsp
index 25d4d9d4c6..c5eb6d3987 100644
--- a/WebContent/WEB-INF/jsp/viewEdit.jsp
+++ b/WebContent/WEB-INF/jsp/viewEdit.jsp
@@ -44,8 +44,6 @@
             mango.share.users = result.shareUsers;
             //mango.share.writeSharedUsers(result.viewUsers);
             dwr.util.addOptions($("componentList"), result.componentTypes, "key", "value");
-            settingsEditor.setPointList(result.pointList);
-            compoundEditor.setPointList(result.pointList, viewId);
             MiscDwr.notifyLongPoll(mango.longPoll.pollSessionId);
         });
         
@@ -57,6 +55,8 @@
         	document.getElementById("sizeLabel").style.visibility = 'hidden';
         	loadDefaultSizeContainer('${form.view.backgroundFilename}','viewBackground');
         }
+
+        loadPointsSelects("select[id^=chartComparator]", "<spring:message code='chosen.selector.selectPoint'/>");
     }
     
     function addViewComponent() {
@@ -454,8 +454,6 @@
     function confirmExit(){
         return false;
     }
-
-
   </script>
   
   <form name="view" class="view-edit-form" style="margin-bottom: 40px;" action="" modelAttribute="form" method="post" enctype="multipart/form-data">
diff --git a/WebContent/WEB-INF/jsp/views.jsp b/WebContent/WEB-INF/jsp/views.jsp
index 7065bfbb8c..7c98b12d77 100644
--- a/WebContent/WEB-INF/jsp/views.jsp
+++ b/WebContent/WEB-INF/jsp/views.jsp
@@ -299,7 +299,11 @@
 	<script type="text/javascript">
 	
 		checkFullScreen();
-	
+
+        jQuery(document).ready(function(){
+            loadPointsSelects("select[id^=chartComparator]", "<spring:message code='chosen.selector.selectPoint'/>");
+        });
+
 	</script>
 
 	<tag:displayView view="${currentView}" emptyMessageKey="views.noViews" />
diff --git a/WebContent/WEB-INF/jsp/watchList.jsp b/WebContent/WEB-INF/jsp/watchList.jsp
index 2ad9d93b81..8e6f73b72f 100644
--- a/WebContent/WEB-INF/jsp/watchList.jsp
+++ b/WebContent/WEB-INF/jsp/watchList.jsp
@@ -620,9 +620,6 @@
 
       jQuery(document).ready(function(){
     	  (function($) {
-    		loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-    		loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-
     		splitContainerHeight = parseInt(getCookie("split_container_height"));
     		if(splitContainerHeight != null){
     			jQuery("#splitContainer").height(splitContainerHeight);
diff --git a/WebContent/WEB-INF/spring-security.xml b/WebContent/WEB-INF/spring-security.xml
index 732fc40e23..628311b6f5 100644
--- a/WebContent/WEB-INF/spring-security.xml
+++ b/WebContent/WEB-INF/spring-security.xml
@@ -232,8 +232,10 @@
         <!-- Reports -->
         <intercept-url pattern="/dwr/call/plaincall/ReportsDwr.init.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
         <intercept-url pattern="/dwr/call/plaincall/ReportsDwr.getReport.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
+        <intercept-url pattern="/dwr/call/plaincall/ReportsDwr.getReportResponse.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
         <intercept-url pattern="/dwr/call/plaincall/ReportsDwr.getReportInstances.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
         <intercept-url pattern="/dwr/call/plaincall/ReportsDwr.createReportFromWatchlist.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
+        <intercept-url pattern="/dwr/call/plaincall/ReportsDwr.createReportFromWatchlistResponse.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
         <intercept-url pattern="/dwr/call/plaincall/ReportsDwr.runReport.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
         <intercept-url pattern="/dwr/call/plaincall/ReportsDwr.saveReport.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
         <intercept-url pattern="/dwr/call/plaincall/ReportsDwr.deleteReport.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
@@ -384,6 +386,8 @@
         <intercept-url pattern="/api/datapoint" access="hasRole('ROLE_ADMIN')" method="PUT" />
         <intercept-url pattern="/api/datapoint/disabled" access="hasRole('ROLE_ADMIN')" method="PUT" />
         <intercept-url pattern="/api/datapoint/enabled" access="hasRole('ROLE_ADMIN')" method="PUT" />
+        <intercept-url pattern="/api/datapoints" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER', 'ROLE_PUBLIC')" method="GET" />
+        <intercept-url pattern="/api/datapoints/bean" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER', 'ROLE_PUBLIC')" method="GET" />
 
         <!-- DataSource GET -->
         <intercept-url pattern="/api/datasource" access="@guard.hasDataSourceReadPermission(request)" method="GET" />
diff --git a/WebContent/WEB-INF/springDispatcher-servlet.xml b/WebContent/WEB-INF/springDispatcher-servlet.xml
index e1e0f8a877..c5abdb2e97 100644
--- a/WebContent/WEB-INF/springDispatcher-servlet.xml
+++ b/WebContent/WEB-INF/springDispatcher-servlet.xml
@@ -237,6 +237,8 @@
         <bean class="org.scada_lts.web.security.XssProtectCssStyleSerializer" />
         <bean class="org.scada_lts.web.beans.serializer.ChronologySerializer" />
         <bean class="org.scada_lts.web.beans.serializer.LocalDateTimeSerializer" />
+        <bean class="org.scada_lts.web.beans.serializer.PointDataTypeSerializer" />
+        <bean class="org.scada_lts.web.beans.serializer.LocalizableMessageSerializer" />
       </array>
     </property>
     <property name="featuresToEnable">
diff --git a/WebContent/WEB-INF/tags/page.tag b/WebContent/WEB-INF/tags/page.tag
index 6c28a5b385..885247f2d6 100644
--- a/WebContent/WEB-INF/tags/page.tag
+++ b/WebContent/WEB-INF/tags/page.tag
@@ -45,6 +45,7 @@
   <link rel="icon" href="images/favicon.ico"/>
   <link rel="shortcut icon" href="images/favicon.ico"/>
   <link href="assets/layout.css" type="text/css" rel="stylesheet"/>
+  <link href="resources/jQuery/plugins/chosen/chosen.min.css" rel="stylesheet" type="text/css"/>
   <c:set var="isRoles" value="${not empty sessionUser && sessionUser.getAttribute('roles') != null}" />
   <c:set var="isRolePublic" value="${isRoles && sessionUser.getAttribute('roles').contains('ROLE_PUBLIC')}" />
   <c:set var="isRoleService" value="${isRoles && (sessionUser.getAttribute('roles').size() == 1 && sessionUser.getAttribute('roles').contains('ROLE_SERVICES'))}" />
@@ -92,6 +93,7 @@
   <script type="text/javascript" src="dwr/interface/MiscDwr.js"></script>
   <script type="text/javascript" src="resources/soundmanager2-nodebug-jsmin.js"></script>
   <script type="text/javascript" src="resources/common.js"></script>
+  <script type="text/javascript" src="resources/jQuery/plugins/chosen/chosen.jquery.min.js"></script>
   <c:if test="${isLoggedToScadaUser}">
       <script src="resources/node_modules/stompjs/lib/stomp.min.js"></script>
       <script src="resources/node_modules/sockjs-client/dist/sockjs.min.js"></script>
diff --git a/WebContent/resources/common.js b/WebContent/resources/common.js
index 49dba3ca4b..e5c951d162 100644
--- a/WebContent/resources/common.js
+++ b/WebContent/resources/common.js
@@ -1289,7 +1289,7 @@ function assignEvent(eventId) {
     MiscDwr.assignEvent(eventId, function(response) {
         if(response) {
             hide("assigneeImg"+ eventId);
-            var imgNode = $("assigneeImg"+ eventId);
+            let imgNode = $("assigneeImg"+ eventId);
             updateImg(imgNode, "images/user_delete.png", mango.i18n["events.unassign"], true, "inline");
             imgNode.onclick = function() {};
         }
@@ -1300,7 +1300,7 @@ function unassignEvent(eventId) {
     MiscDwr.unassignEvent(eventId, function(response) {
         if(response) {
             hide("unassigneeImg"+ eventId);
-            var imgNode = $("unassigneeImg"+ eventId);
+            let imgNode = $("unassigneeImg"+ eventId);
             updateImg(imgNode, "images/user_add.png", mango.i18n["events.assign"], true, "inline");
             imgNode.onclick = function() {};
         }
@@ -1331,160 +1331,82 @@ function setValueInNode(id, text) {
    }
 }
 
-function ScriptPointsContext(startContext, points) {
+class PointsContext {
 
-    this.contextArray = new Array();
-    this.pointsArray = new Array();
-    this.contextTableId = "contextTable";
-    this.contextTableEmptyId = "contextTableEmpty";
-    this.contextTableHeadersId = "contextTableHeaders";
-    this.allPointsListId = "allPointsList";
+    constructor (dataPointsSelect, contextTableIdConstructor) {
+       this.dataPointsSelect = dataPointsSelect;
 
-    this.initContextArray = function (context, points) {
-       console.log('initContextArray context: ', context);
-       console.log('initContextArray points: ', points);
-       this.pointsArray = points;
-       dwr.util.removeAllRows(this.contextTableId);
-       for (let i = 0; i < context.length; i++) {
-            let row = this.addToContextArray(context[i].key, context[i].value);
-            this.writeContextArray(row);
-       }
-       this.updatePointsList();
-    }
-
-    this.convertToSave = function () {
-       let context = new Array();
-       for (let i = 0; i < this.contextArray.length; i++) {
-          context[context.length] = {
-              key : this.contextArray[i].pointId,
-              value : this.contextArray[i].scriptVarName
-          };
-       }
-       return context;
+       this.contextArray = [];
+       this.contextTableId = contextTableIdConstructor || "contextTable";
+       this.contextTableEmptyId = "contextTableEmpty";
+       this.contextTableHeadersId = "contextTableHeaders";
+       this.init(dataPointsSelect.getExcludePointsArray());
     }
 
-    this.addPointToContext = function () {
-        let pointId = $get(this.allPointsListId);
-        this.removeFromContextArray(pointId);
-        let row = this.addToContextArray(pointId, "p"+ pointId);
-        this.writeContextArray(row);
+    init(context) {
+       dwr.util.removeAllRows(this.contextTableId);
+       this.contextArray.length = 0;
+       this.dataPointsSelect.updatePointsList(this.contextArray);
     }
 
-    this.addToContextArray = function (pointId, scriptVarName) {
-       let data = getElement(this.pointsArray, pointId);
-       if (data) {
-          this.contextArray[this.contextArray.length] = {
-              pointId : pointId,
-              pointName : data.name,
-              xid : data.xid,
-              pointType : data.type,
-              scriptVarName : scriptVarName
-          };
-          return this.contextArray[this.contextArray.length - 1];
-       }
+    convertToSave() {
        return null;
     }
 
-    this.removeFromContextArray = function (pointId) {
+    writeContextArray(row) {}
+
+    removeFromContextArray(pointId) {
        for (let i = 0; i < this.contextArray.length; i++) {
           let context = this.contextArray[i];
-          if (context.pointId == pointId) {
-              this.removeContextArray(context);
-              this.contextArray.splice(i, 1);
-              this.updatePointsList();
+          let contextPointId = context.pointId;
+          if (contextPointId == pointId) {
+              this.#removeContextArray(context);
           }
        }
     }
 
-    this.writeContextArray = function (row) {
-       if (this.contextArray.length == 0) {
-          show($(this.contextTableEmptyId));
-          hide($(this.contextTableHeadersId));
-       } else if(row) {
-          hide($(this.contextTableEmptyId));
-          show($(this.contextTableHeadersId));
-          dwr.util.addRows(this.contextTableId, [row],
-              [
-                  function(data) { return "<span>" + data.pointName + "</span>" },
-                  function(data) { return "<span>" + data.xid + "</span>"; },
-                  function(data) { return data.pointType; },
-                  function(data) {
-                          return "<input type='text' value='"+ data.scriptVarName +"' class='formShort' "+
-                                  "onblur='scriptPointsContext.updatePoint("+ data.pointId +", \"scriptVarName\", this.value)'/>";
-                  },
-                  function(data) {
-                          return "<img src='images/bullet_delete.png' class='ptr' "+
-                                  "onclick='scriptPointsContext.removeFromContextArray("+ data.pointId +")'/>";
-                  }
-              ],
-              {
-                  rowCreator:function(options) {
-                      var tr = document.createElement("tr");
-                      tr.className = "smRow"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
-                      return tr;
-                  }
-              });
-      }
-      this.updatePointsList();
+    updatePoint(pointId, key, value) {
+        let item = getElement(this.contextArray, pointId, "pointId");
+        if (item)
+            item[key] = value;
     }
 
-    this.removeContextArray = function (row) {
-       if (this.contextArray.length == 0) {
-          show($(this.contextTableEmptyId));
-          hide($(this.contextTableHeadersId));
-       } else {
-          hide($(this.contextTableEmptyId));
-          show($(this.contextTableHeadersId));
-          this.removeRow(this.contextTableId, row, [1], ["xid"]);
-       }
+    addContextPoint(point) {
+        this.contextArray[this.contextArray.length] = point;
+        this.dataPointsSelect.updatePointsList(this.contextArray);
     }
 
-    this.updatePointsList = function () {
-       let availPoints = new Array();
-       for (let i = 0; i < this.pointsArray.length; i++) {
-          let found = false;
-          for (let j = 0; j < this.contextArray.length; j++) {
-              if (this.contextArray[j].pointId == this.pointsArray[i].id) {
-                  found = true;
-                  break;
-              }
-          }
-          if (!found) {
-              availPoints[availPoints.length] = this.pointsArray[i];
-          }
-       }
-       this.addOptions(this.allPointsListId, availPoints, "id", "name");
-       jQuery("#" + this.allPointsListId).trigger('chosen:updated');
-    }
-
-    this.addOptions = function (id, availPoints, key, value) {
-      document.getElementById(id).options.length = 0;
-      let select = document.getElementById(id);
-      for (let i = 0; i < availPoints.length; i++) {
-          let opt = document.createElement('option');
-          opt.value = availPoints[i][key];
-          opt.innerHTML = availPoints[i][value];
-          select.appendChild(opt);
-      }
+    initAddPointToContext() {
+        let pointId = this.dataPointsSelect.getPointId();
+        this.removeFromContextArray(pointId);
+        return pointId;
     }
 
-    this.removeRow = function (tableId, criteriaToDelete, rowOptions, criteriaToDeleteOptions) {
-      let table = document.getElementById(tableId);
-      let rows = table.rows;
-      let toDeleteIndexes = new Array();
-      for (let i = 0; i < rows.length; i++) {
-          let row = rows[i];
-          if(this.equalsByOptions(row, criteriaToDelete, rowOptions, criteriaToDeleteOptions)) {
-              toDeleteIndexes[toDeleteIndexes.length] = i;
-          }
-      }
+    getPointById(pointId) {
+        return this.dataPointsSelect.getPointById(pointId);
+    }
 
-      for(let i = 0; i < toDeleteIndexes.length; i++) {
-          table.deleteRow(toDeleteIndexes[i]);
-      }
+    getContextPointById(pointId) {
+        return this.contextArray.find(context => context.pointId == pointId);
+    }
+
+    getContextArray() {
+        return [...new Set(this.contextArray)];
     }
 
-    this.equalsByOptions = function (row, obj, rowOptions, objOptions) {
+    getContextTableId() {
+        return this.contextTableId;
+    }
+
+    getContextTableEmptyId() {
+        return this.contextTableEmptyId;
+    }
+
+    getContextTableHeadersId() {
+        return this.contextTableHeadersId;
+    }
+
+    #equalsByOptions(row, obj, rowOptions, objOptions) {
       for (let i = 0; i < objOptions.length; i++) {
           let cellValue = row.cells[rowOptions[i]].textContent;
           let objectValue = obj[objOptions[i]];
@@ -1498,202 +1420,791 @@ function ScriptPointsContext(startContext, points) {
       return true;
     }
 
-    this.updatePoint = function (pointId, key, value) {
-        var item = getElement(this.contextArray, pointId, "pointId");
-        if (item)
-            item[key] = value;
+    #removeContextArray(row) {
+       let contextTableEmptyIdNode = $(this.contextTableEmptyId);
+       let contextTableHeadersIdNode = $(this.contextTableHeadersId);
+       if (this.contextArray.length == 0 && contextTableEmptyIdNode && contextTableHeadersIdNode) {
+          show(contextTableEmptyIdNode);
+          hide(contextTableHeadersIdNode);
+       } else {
+          if(contextTableEmptyIdNode)
+            hide(contextTableEmptyIdNode);
+          if(contextTableHeadersIdNode)
+            show(contextTableHeadersIdNode);
+          this.#removeRow(this.contextTableId, row, [1], ["pointXid"]);
+          this.contextArray = this.contextArray.filter(context => context.pointId != row.pointId);
+          this.dataPointsSelect.updatePointsList(this.contextArray);
+       }
     }
 
-    this.initContextArray(startContext, points);
+    #removeRow(tableId, criteriaToDelete, rowOptions, criteriaToDeleteOptions) {
+      let table = document.getElementById(tableId);
+      let rows = table.rows;
+      let toDeleteRows = new Array();
+      for (let i = 0; i < rows.length; i++) {
+          let row = rows[i];
+          if(this.#equalsByOptions(row, criteriaToDelete, rowOptions, criteriaToDeleteOptions)) {
+              toDeleteRows[toDeleteRows.length] = row;
+          }
+      }
+
+      for(let i = 0; i < toDeleteRows.length; i++) {
+          table.removeChild(toDeleteRows[i]);
+      }
+    }
 }
 
-function ReportPointsContext(startContext, points) {
+class ScriptPointsContext extends PointsContext {
 
-    this.contextArray = new Array();
-    this.pointsArray = new Array();
-    this.contextTableId = "contextTable";
-    this.contextTableEmptyId = "contextTableEmpty";
-    this.contextTableHeadersId = "contextTableHeaders";
-    this.allPointsListId = "allPointsList";
+    init(context) {
+       super.init();
+       for (let i = 0; i < context.length; i++) {
+            let row = this.addToContextArray(context[i].key, context[i].value);
+            this.writeContextArray(row);
+       }
+    }
 
-    this.initContextArray = function (context, points) {
-       console.log('initContextArray context: ', context);
-       console.log('initContextArray points: ', points);
-       this.pointsArray = points;
-       dwr.util.removeAllRows(this.contextTableId);
+    convertToSave() {
+       let context = [];
+       let contextArray = super.getContextArray();
+       for (let i = 0; i < contextArray.length; i++) {
+          context[context.length] = {
+              key : contextArray[i].pointId,
+              value : contextArray[i].scriptVarName
+          };
+       }
+       return context;
+    }
+
+    addPointToContext() {
+        let pointId = super.initAddPointToContext();
+        let row = this.addToContextArray(pointId, "p"+ pointId);
+        this.writeContextArray(row);
+    }
+
+    addToContextArray(pointId, scriptVarName) {
+       let data = super.getPointById(pointId);
+       if (data) {
+          let contextPoint = {
+              pointId : data.id,
+              pointName : data.extendName ? data.extendName : data.name,
+              pointXid : data.xid,
+              pointType : data.dataTypeMessage,
+              pointTypeId : data.dataType,
+              scriptVarName : scriptVarName
+          };
+          super.addContextPoint(contextPoint);
+          return contextPoint;
+       }
+       return null;
+    }
+
+    writeContextArray(row) {
+       if (super.getContextArray().length == 0) {
+          show($(super.getContextTableEmptyId()));
+          hide($(super.getContextTableHeadersId()));
+       } else if(row) {
+          hide($(super.getContextTableEmptyId()));
+          show($(super.getContextTableHeadersId()));
+          dwr.util.addRows(super.getContextTableId(), [row],
+          [
+              function(data) { return "<span>" + data.pointName + "</span>"; },
+              function(data) { return "<span>" + data.pointXid + "</span>"; },
+              function(data) { return "<span>" + data.pointType + "</span>"; },
+              function(data) {
+                      return "<input type='text' value='"+ data.scriptVarName +"' class='formShort' "+
+                              "onblur='pointsContext.updatePoint("+ data.pointId +", \"scriptVarName\", this.value)'/>";
+              },
+              function(data) {
+                      return "<img src='images/bullet_delete.png' class='ptr' "+
+                              "onclick='pointsContext.removeFromContextArray("+ data.pointId +")'/>";
+              }
+          ],
+          {
+              rowCreator:function(options) {
+                  let tr = document.createElement("tr");
+                  tr.className = "smRow"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
+                  return tr;
+              }
+          });
+      }
+    }
+}
+
+class ReportPointsContext extends PointsContext {
+
+    init(context) {
+       super.init();
        for (let i = 0; i < context.length; i++) {
             let row = this.addToContextArray(context[i].pointId, context[i].colour, context[i].consolidatedChart);
             this.writeContextArray(row);
        }
-       this.updatePointsList();
     }
 
-    this.convertToSave = function () {
-       let context = new Array();
-       for (let i = 0; i < this.contextArray.length; i++) {
+    convertToSave() {
+       let context = [];
+       let contextArray = super.getContextArray();
+       for (let i = 0; i < contextArray.length; i++) {
           context[context.length] = {
-                pointId: this.contextArray[i].pointId,
-                pointXid: this.contextArray[i].xid,
-                colour: this.contextArray[i].colour,
-                consolidatedChart: this.contextArray[i].consolidatedChart
+                pointId: contextArray[i].pointId,
+                pointXid: contextArray[i].pointXid,
+                colour: contextArray[i].colour,
+                consolidatedChart: contextArray[i].consolidatedChart
           };
        }
        return context;
     }
 
-    this.addPointToContext = function () {
-        let pointId = $get(this.allPointsListId);
-        this.removeFromContextArray(pointId);
-        let reportRow = this.addToContextArray(pointId, "", true);
-        this.writeContextArray(reportRow);
+    addPointToContext() {
+        let pointId = super.initAddPointToContext();
+        let row = this.addToContextArray(pointId, "", true);
+        this.writeContextArray(row);
     }
 
-    this.addToContextArray = function (pointId, colour, consolidatedChart) {
-       let data = getElement(this.pointsArray, pointId);
+    addToContextArray(pointId, colour, consolidatedChart) {
+       let data = super.getPointById(pointId);
        if (data) {
-          this.contextArray[this.contextArray.length] = {
-                pointId: pointId,
+          let contextPoint = {
+                pointId: data.id,
                 pointXid: data.xid,
-                pointName : data.name,
+                pointName : data.extendName ? data.extendName : data.name,
                 pointType : data.dataTypeMessage,
+                pointTypeId : data.dataType,
                 colour : !colour ? (!data.chartColour ? "" : data.chartColour) : colour,
                 consolidatedChart : consolidatedChart
           };
-          return this.contextArray[this.contextArray.length - 1];
+          super.addContextPoint(contextPoint);
+          return contextPoint;
        }
        return null;
     }
 
-    this.writeContextArray = function (row) {
-        if (this.contextArray.length == 0) {
-            show($(this.contextTableEmptyId));
-            hide($(this.contextTableHeadersId));
+    writeContextArray(row) {
+        if (super.getContextArray().length == 0) {
+            show($(super.getContextTableEmptyId()));
+            hide($(super.getContextTableHeadersId()));
         } else if (row) {
-            hide($(this.contextTableEmptyId));
-            show($(this.contextTableHeadersId));
-            dwr.util.addRows(this.contextTableId, [row],
-                [
-                    function(data) { return data.pointName; },
-                    function(data) { return data.pointXid; },
-                    function(data) { return data.pointType; },
-                    function(data) {
-                            return "<input type='text' value='"+ data.colour +"' "+
-                                    "onblur='reportPointsContext.updatePoint("+ data.pointId +", \"colour\", this.value)'/>";
-                    },
-                    function(data) {
-                        return "<input type='checkbox'"+ (data.consolidatedChart ? " checked='checked'" : "") +
-                                " onclick='reportPointsContext.updatePoint("+ data.pointId +", \"consolidatedChart\", this.checked)'/>";
-                    },
-                    function(data) {
-                            return "<img src='images/bullet_delete.png' class='ptr' "+
-                                    "onclick='reportPointsContext.removeFromContextArray("+ data.pointId +")'/>";
-                    }
-                ],
-                {
-                    rowCreator:function(options) {
-                        var tr = document.createElement("tr");
-                        tr.className = "smRow"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
-                        return tr;
-                    },
-                    cellCreator:function(options) {
-                        var td = document.createElement("td");
-                        if (options.cellNum == 4)
-                            td.align = "center";
-                        return td;
-                    }
-                });
+            hide($(super.getContextTableEmptyId()));
+            show($(super.getContextTableHeadersId()));
+            dwr.util.addRows(super.getContextTableId(), [row],
+            [
+                function(data) { return "<span>" + data.pointName + "</span>"; },
+                function(data) { return "<span>" + data.pointXid + "</span>"; },
+                function(data) { return "<span>" + data.pointType + "</span>"; },
+                function(data) {
+                        return "<input type='text' value='"+ data.colour +"' "+
+                                "onblur='pointsContext.updatePoint("+ data.pointId +", \"colour\", this.value)'/>";
+                },
+                function(data) {
+                    return "<input type='checkbox'"+ (data.consolidatedChart ? " checked='checked'" : "") +
+                            " onclick='pointsContext.updatePoint("+ data.pointId +", \"consolidatedChart\", this.checked)'/>";
+                },
+                function(data) {
+                        return "<img src='images/bullet_delete.png' class='ptr' "+
+                                "onclick='pointsContext.removeFromContextArray("+ data.pointId +")'/>";
+                }
+            ],
+            {
+                rowCreator:function(options) {
+                    let tr = document.createElement("tr");
+                    tr.className = "smRow"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
+                    return tr;
+                },
+                cellCreator:function(options) {
+                    let td = document.createElement("td");
+                    if (options.cellNum == 4)
+                        td.align = "center";
+                    return td;
+                }
+            });
         }
-        this.updatePointsList();
     }
+}
 
-    this.removeFromContextArray = function (pointId) {
-       for (let i = 0; i < this.contextArray.length; i++) {
-          let context = this.contextArray[i];
-          if (context.pointId == pointId) {
-              this.removeContextArray(context);
-              this.contextArray.splice(i, 1);
-              this.updatePointsList();
-          }
+class SenderPointsContext extends PointsContext {
+
+    init(context) {
+       super.init();
+       for (let i = 0; i < context.length; i++) {
+            let row = this.addToContextArray(context[i].dataPointId, context[i].parameterName, context[i].includeTimestamp);
+            this.writeContextArray(row);
        }
     }
 
-    this.removeContextArray = function (row) {
-       if (this.contextArray.length == 0) {
-          show($(this.contextTableEmptyId));
-          hide($(this.contextTableHeadersId));
-       } else {
-          hide($(this.contextTableEmptyId));
-          show($(this.contextTableHeadersId));
-          this.removeRow(this.contextTableId, row, [1], ["pointXid"]);
+    convertToSave() {
+       let context = [];
+       let contextArray = super.getContextArray();
+       for (let i = 0; i < contextArray.length; i++) {
+          context[context.length] = {
+            dataPointId: contextArray[i].pointId,
+            pointXid : contextArray[i].pointXid,
+            parameterName: contextArray[i].parameterName,
+            includeTimestamp: contextArray[i].includeTimestamp
+          };
+       }
+       return context;
+    }
+
+    addPointToContext() {
+        let pointId = super.initAddPointToContext();
+        let row = this.addToContextArray(pointId, null, true);
+        this.writeContextArray(row);
+    }
+
+    addToContextArray(pointId, parameterName, includeTimestamp) {
+       let data = super.getPointById(pointId);
+       if (parameterName == null)
+           parameterName = data.name;
+       if (data) {
+          let contextPoint = {
+               pointId : data.id,
+               pointXid : data.xid,
+               pointName : data.extendName ? data.extendName : data.name,
+               enabled : data.enabled,
+               pointType : data.dataTypeMessage,
+               pointTypeId : data.dataType,
+               parameterName: parameterName,
+               includeTimestamp: includeTimestamp
+           };
+           super.addContextPoint(contextPoint);
+           return contextPoint;
+       }
+       return null;
+   }
+
+    writeContextArray(row) {
+      if (super.getContextArray().length == 0) {
+      } else if (row) {
+          dwr.util.addRows(super.getContextTableId(), [row],
+          [
+              function(data) { return "<span>" + data.pointName + "</span>";  },
+              function(data) { return "<span>" + data.pointXid + "</span>"; },
+              function(data) { return "<img src='images/"+ (data.enabled ? "brick_go" : "brick_stop") +".png'/>"; },
+              function(data) { return "<span>" + data.pointType + "</span>";  },
+              function(data) {
+                      return "<input type='text' value='"+ data.parameterName +"' "+
+                              "onblur='pointsContext.updatePoint("+ data.pointId +", \"parameterName\", this.value)'/>";
+              },
+              function(data) {
+                      return "<input type='checkbox' "+ (data.includeTimestamp ? "checked='checked' " : "") +
+                              "onclick='pointsContext.updatePoint("+ data.pointId +", \"includeTimestamp\", this.checked)'/>";
+              },
+              function(data) {
+                      return "<img src='images/bullet_delete.png' class='ptr' "+
+                              "onclick='pointsContext.removeFromContextArray("+ data.pointId +")'/>";
+              }
+          ],
+          {
+              rowCreator: function(options) {
+                  let tr = document.createElement("tr");
+                  tr.className = "row"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
+                  return tr;
+              },
+              cellCreator: function(options) {
+                  let td = document.createElement("td");
+                  if (options.cellNum == 1 || options.cellNum == 4)
+                      td.align = "center";
+                  return td;
+              }
+          });
+      }
+    }
+}
+
+class PersistentPointsContext extends PointsContext {
+
+    init(context) {
+       super.init();
+       for (let i = 0; i < context.length; i++) {
+            let row = this.addToContextArray(context[i].dataPointId);
+            this.writeContextArray(row);
+       }
+    }
+
+    convertToSave() {
+       let context = [];
+       let contextArray = super.getContextArray();
+       for (let i = 0; i < contextArray.length; i++) {
+          context[context.length] = {
+            dataPointId: contextArray[i].pointId,
+            pointXid : contextArray[i].pointXid
+          };
+       }
+       return context;
+    }
+
+    addPointToContext() {
+        let pointId = super.initAddPointToContext();
+        let row = this.addToContextArray(pointId);
+        this.writeContextArray(row);
+    }
+
+    addToContextArray(pointId) {
+       let data = super.getPointById(pointId);
+       if (data) {
+          let contextPoint = {
+                pointId : data.id,
+                pointXid : data.xid,
+                pointName : data.extendName ? data.extendName : data.name,
+                enabled : data.enabled,
+                pointType : data.dataTypeMessage,
+                pointTypeId : data.dataType
+           };
+           super.addContextPoint(contextPoint);
+           return contextPoint;
+       }
+       return null;
+   }
+
+    writeContextArray(row) {
+      if (super.getContextArray().length == 0) {
+      } else if (row) {
+            dwr.util.addRows(super.getContextTableId(), [row],
+            [
+                function(data) { return "<span>" + data.pointName + "</span>"; },
+                function(data) { return "<span>" + data.pointXid + "</span>"; },
+                function(data) { return "<img src='images/"+ (data.enabled ? "brick_go" : "brick_stop") +".png'/>"; },
+                function(data) { return "<span>" + data.pointType + "</span>"; },
+                function(data) {
+                        return "<img src='images/bullet_delete.png' class='ptr' "+
+                                "onclick='pointsContext.removeFromContextArray("+ data.pointId +")'/>";
+                }
+            ],
+            {
+                rowCreator: function(options) {
+                    let tr = document.createElement("tr");
+                    tr.className = "row"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
+                    return tr;
+                },
+                cellCreator: function(options) {
+                    let td = document.createElement("td");
+                    if (options.cellNum == 1 || options.cellNum == 3)
+                        td.align = "center";
+                    return td;
+                }
+            });
+      }
+    }
+}
+
+class PachubePointsContext extends PointsContext {
+
+    init(context) {
+       super.init();
+       for (let i = 0; i < context.length; i++) {
+            let row = this.addToContextArray(context[i].dataPointId, context[i].feedId, context[i].dataStreamId);
+            this.writeContextArray(row);
+       }
+    }
+
+    convertToSave() {
+       let context = [];
+       let contextArray = super.getContextArray();
+       for (let i = 0; i < contextArray.length; i++) {
+          context[context.length] = {
+            dataPointId: contextArray[i].pointId,
+            pointXid : contextArray[i].pointXid,
+            feedId: contextArray[i].feedId,
+            dataStreamId: contextArray[i].dataStreamId
+          };
+       }
+       return context;
+    }
+
+    addPointToContext() {
+        let pointId = super.initAddPointToContext();
+        let row = this.addToContextArray(pointId, "", "");
+        this.writeContextArray(row);
+    }
+
+    addToContextArray(pointId, feedId, dataStreamId) {
+       let data = super.getPointById(pointId);
+       if (data) {
+          let contextPoint = {
+              pointId : data.id,
+              pointXid : data.xid,
+              pointName : data.extendName ? data.extendName : data.name,
+              enabled : data.enabled,
+              pointType : data.dataTypeMessage,
+              pointTypeId : data.dataType,
+              feedId: feedId,
+              dataStreamId: dataStreamId
+           };
+           super.addContextPoint(contextPoint);
+           return contextPoint;
        }
+       return null;
+    }
+
+    writeContextArray(row) {
+      if (super.getContextArray().length == 0) {
+      } else if (row) {
+            dwr.util.addRows(super.getContextTableId(), [row],
+            [
+                function(data) { return "<span>" + data.pointName + "</span>"; },
+                function(data) { return "<span>" + data.pointXid + "</span>"; },
+                function(data) { return "<img src='images/"+ (data.enabled ? "brick_go" : "brick_stop") +".png'/>"; },
+                function(data) { return "<span>" + data.pointType + "</span>"; },
+                function(data) {
+                        return "<input type='text' value='"+ data.feedId +"' "+
+                                "onblur='pointsContext.updatePoint("+ data.pointId +", \"feedId\", this.value)'/>";
+                },
+                function(data) {
+                      return "<input type='text' value='"+ data.dataStreamId +"' "+
+                                "onblur='pointsContext.updatePoint("+ data.pointId +", \"dataStreamId\", this.value)'/>";
+                },
+                function(data) {
+                        return "<img src='images/bullet_delete.png' class='ptr' "+
+                                "onclick='pointsContext.removeFromContextArray("+ data.pointId +")'/>";
+                }
+            ],
+            {
+                rowCreator: function(options) {
+                    let tr = document.createElement("tr");
+                    tr.className = "row"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
+                    return tr;
+                },
+                    cellCreator: function(options) {
+                        let td = document.createElement("td");
+                        if (options.cellNum == 1 || options.cellNum == 4)
+                            td.align = "center";
+                        return td;
+                }
+            });
+      }
+    }
+}
+
+class ObjectsSelect {
+
+    constructor (objectsSelectDef) {
+
+        this.excludeObjectsArray = objectsSelectDef.excludeObjectsArray || [];
+        this.limit = objectsSelectDef.limit ? (objectsSelectDef.limit < 10 ? 10 : objectsSelectDef.limit) : 500;
+        this.selectHtmlId = objectsSelectDef.selectHtmlId || "allObjectsList";
+        this.inputSelector = "#" + objectsSelectDef.selectHtmlId + "_chosen .chosen-search input";
+        this.listSelector = "#" + objectsSelectDef.selectHtmlId + "_chosen .chosen-results";
+        this.placeholderTextSingle = objectsSelectDef.placeholderTextSingle;
+        this.objectsArray = objectsSelectDef.objectsArray || [];
+        this.dataTypes = objectsSelectDef.dataTypes || [];
+        this.altKey = objectsSelectDef.altKey || "id";
+        this.altValue = objectsSelectDef.altValue || "name";
+        this.invisibleEmptyOption = objectsSelectDef.invisibleEmptyOption || false;
+        this.widthPx = objectsSelectDef.widthPx || "400px";
+        this.imgAddHtmlIds = objectsSelectDef.imgAddHtmlIds || ["icon_comp_add", "icon_add"];
+        this.nextPage = objectsSelectDef.nextPage || 1;
+        this.keywordSearchLast = objectsSelectDef.keywordSearch || "";
+        this.startAsEmpty = objectsSelectDef.startAsEmpty || false;
+        this.settable = objectsSelectDef.settable ? objectsSelectDef.settable : "";
+        this.endpoint = objectsSelectDef.endpoint || "api/objects/bean";
+        this.idNames = objectsSelectDef.idNames || ["id", "key", "objectId"];
+        this.#init();
+    }
+
+    getExcludeObjectsArray() {
+        return [...new Set(this.excludeObjectsArray)];
+    }
+
+    getSelectHtmlId() {
+        return this.selectHtmlId;
+    }
+
+    getObjectId() {
+        let select = document.getElementById(this.selectHtmlId);
+        if(select && select.value && select.value !== 'undefined') {
+            try {
+                return parseInt(select.value);
+            } catch (error) {
+                return 0;
+            }
+        }
+        return 0;
+    }
+
+    getObject() {
+        let objectId = this.getObjectId();
+        return this.getObjectById(objectId);
+    }
+
+    getObjectById(objectId) {
+        let select = this;
+        return this.objectsArray.find(object => {
+            return select.#getId(object, select.idNames) == objectId;
+        });
+    }
+
+    setDataTypes(dataTypes) {
+        this.dataTypes = [...new Set(dataTypes)];
+    }
+
+    loadObjectsList() {
+        let select = this;
+        this.#loadObjects("", 0, this.lastObject, 0, function(objects) {
+            select.#setObjectsArray(objects);
+        });
+    }
+
+    setObjectId(objectId) {
+        let option = document.querySelector('#' + this.selectHtmlId + ' [value="' + objectId + '"]');
+        if(option) {
+            option.selected = true;
+        }
+        jQuery("#" + this.selectHtmlId).trigger('chosen:updated');
+        this.lastObject = this.getObject();
     }
 
-    this.updatePointsList = function () {
-       let availPoints = new Array();
-       for (let i = 0; i < this.pointsArray.length; i++) {
+    updateObjectsList(excludeObjects) {
+       let tempArray = this.objectsArray;
+       let availObjects = new Array();
+       this.excludeObjectsArray = [...new Set(excludeObjects)];
+       for (let i = 0; i < tempArray.length; i++) {
           let found = false;
-          for (let j = 0; j < this.contextArray.length; j++) {
-              if (this.contextArray[j].pointId == this.pointsArray[i].id) {
+          let id = this.#getId(tempArray[i], this.idNames);
+          let dataType = this.#getDataType(tempArray[i]);
+          for (let j = 0; j < excludeObjects.length; j++) {
+              if (id != -1 && this.#getId(excludeObjects[j], this.idNames) == id) {
                   found = true;
                   break;
               }
           }
           if (!found) {
-              availPoints[availPoints.length] = this.pointsArray[i];
+              availObjects[availObjects.length] = tempArray[i];
           }
        }
-       this.addOptions(this.allPointsListId, availPoints, "id", "name");
-       jQuery("#" + this.allPointsListId).trigger('chosen:updated');
-    }
-
-    this.addOptions = function (id, availPoints, key, value) {
-      document.getElementById(id).options.length = 0;
-      let select = document.getElementById(id);
-      for (let i = 0; i < availPoints.length; i++) {
-          let opt = document.createElement('option');
-          opt.value = availPoints[i][key];
-          opt.innerHTML = availPoints[i][value];
-          select.appendChild(opt);
-      }
+
+       if(!this.invisibleEmptyOption) {
+          let single = {}
+          single[this.altKey] = undefined;
+          single[this.altValue] = this.placeholderTextSingle;
+          this.#addEmptyOption(availObjects, single);
+       }
+
+       if(availObjects.length == 0 && this.lastObject) {
+           availObjects.push(this.lastObject);
+       }
+
+       this.#addOptions(this.selectHtmlId, availObjects, "id", this.altKey, "extendName", this.altValue);
+       jQuery("#" + this.selectHtmlId).trigger('chosen:updated');
     }
 
-    this.removeRow = function (tableId, criteriaToDelete, rowOptions, criteriaToDeleteOptions) {
-      let table = document.getElementById(tableId);
-      let rows = table.rows;
-      let toDeleteIndexes = new Array();
-      for (let i = 0; i < rows.length; i++) {
-          let row = rows[i];
-          if(this.equalsByOptions(row, criteriaToDelete, rowOptions, criteriaToDeleteOptions)) {
-              toDeleteIndexes[toDeleteIndexes.length] = i;
-          }
-      }
+    #init() {
+        for(let i = 0; i < this.imgAddHtmlIds.length; i++) {
+            let node = getNodeIfString(this.imgAddHtmlIds[i]);
+            if(node) {
+                show(node);
+            }
+        }
+        jQuery(this.inputSelector).off('input');
+        jQuery(this.listSelector).off('scrollend');
+
+        jQuery("#" + this.selectHtmlId).chosen({
+           allow_single_deselect: true,
+           placeholder_text_single: this.placeholderTextSingle,
+           search_contains: true,
+           max_shown_results: this.limit,
+           width: this.widthPx,
+           case_sensitive_search: false
+        });
 
-      for(let i = 0; i < toDeleteIndexes.length; i++) {
-          table.deleteRow(toDeleteIndexes[i]);
-      }
+        this.updateObjectsList(this.excludeObjectsArray);
+
+        if(this.objectsArray.length == 1) {
+            this.setObjectId(this.#getId(this.objectsArray[0], this.idNames));
+        }
+
+        if(!this.startAsEmpty) {
+            this.loadObjectsList();
+        }
+
+        let select = this;
+
+        jQuery(this.inputSelector).on("input", function(evt) {
+            if(!evt.originalEvent || !evt.originalEvent.isTrusted) {
+                return;
+            }
+            select.#loadObjects(evt.target.value, 700, select.lastObject, 0, function(objects) {
+                select.#setObjectsArray(objects);
+            });
+        });
+
+        jQuery(this.listSelector).on('scrollend', function(evt) {
+            if(!evt.originalEvent || !evt.originalEvent.isTrusted) {
+                return;
+            }
+            let element = jQuery(evt.currentTarget);
+            if (element[0].scrollHeight - element.scrollTop() <= element.outerHeight()) {
+                select.#loadObjects(select.keywordSearchLast, 0, undefined, select.nextPage, function(objects) {
+                    select.#addObjectsArray(objects);
+                });
+            }
+        });
     }
 
-    this.equalsByOptions = function (row, obj, rowOptions, objOptions) {
-      for (let i = 0; i < objOptions.length; i++) {
-          let cellValue = row.cells[rowOptions[i]].textContent;
-          let objectValue = obj[objOptions[i]];
-          if (!cellValue || !objectValue) {
-              return false;
-          }
-          if (cellValue != objectValue) {
-              return false;
-          }
-      }
-      return true;
+    #setObjectsArray(objectsArray) {
+        this.nextPage = 1;
+        this.objectsArray = [...new Set(objectsArray)];
+        this.updateObjectsList(this.excludeObjectsArray);
     }
 
-    this.updatePoint = function (pointId, key, value) {
-        var item = getElement(this.contextArray, pointId, "pointId");
-        if (item)
-            item[key] = value;
+    #loadObjects(keywordSearch, timeout, object, page, doExecute) {
+        this.keywordSearchLast = keywordSearch;
+        let select = this;
+        this.#setSearchTimer(setTimeout(() => {
+            let excludeIds = [];
+            let excludeObjects = select.excludeObjectsArray;
+            for(let i = 0; i < excludeObjects.length; i++) {
+                let id = select.#getId(excludeObjects[i], select.idNames);
+                if(id != -1 && excludeIds.indexOf(id) == -1) {
+                    excludeIds[excludeIds.length] = id;
+                }
+            }
+            jQuery.ajax({
+                type: "GET",
+                contentType: "application/json; charset=utf-8",
+                dataType: "json",
+                url: getAppLocation() + select.endpoint + "?keywordSearch=" + encodeURIComponent(keywordSearch)
+                + "&limit=" + select.limit + "&excludeIds=" + excludeIds + "&dataTypes=" + select.dataTypes + "&page=" + page
+                + "&settable=" + select.settable,
+                success: function(objects) {
+                    let id = object ? select.#getId(object, select.idNames) : -1;
+                    if(id != -1 && object) {
+                        if(select.invisibleEmptyOption) {
+                            objects = objects.filter(p => select.#getId(p, select.idNames) != id);
+                            objects.unshift(object);
+                        } else {
+                            let find = objects.find(p => select.#getId(p, select.idNames) == id);
+                            if(!find) {
+                                objects.unshift(object);
+                            }
+                        }
+                    }
+                    doExecute(objects);
+                    if(id != -1) {
+                        select.setObjectId(id);
+                    }
+                    if(keywordSearch) {
+                        jQuery(select.inputSelector).val(keywordSearch);
+                    }
+                },
+                error: function(request, textStatus, errorThrown) {
+                    console.log("chosen-search-input error:", [request, textStatus, errorThrown]);
+                }
+            });
+        }, timeout));
     }
 
-    this.initContextArray(startContext, points);
+    #addOptions(id, availObjects, key, altKey, value, altValue) {
+        document.getElementById(id).options.length = 0;
+        let select = document.getElementById(id);
+        for (let i = 0; i < availObjects.length; i++) {
+            let opt = document.createElement('option');
+            opt.value = availObjects[i][key] ? availObjects[i][key] : availObjects[i][altKey];
+            opt.innerHTML = availObjects[i][value] ? availObjects[i][value] : availObjects[i][altValue] ;
+            select.appendChild(opt);
+        }
+    }
+
+    #addEmptyOption(availObjects, object) {
+        let emptyIndex = availObjects.indexOf(object);
+        if(emptyIndex == -1) {
+           availObjects.unshift(object);
+        }
+    }
+
+    #getId(object, idNames) {
+        for(let i=0; i<idNames.length; i++) {
+            if(object[idNames[i]]) {
+                return object[idNames[i]];
+            }
+        }
+        return -1;
+    }
+
+    #getDataType(object) {
+        if(object.dataType)
+            return object.dataType;
+        if(object.dataTypeId)
+            return object.dataTypeId;
+        return -1;
+    }
+
+    #setSearchTimer(searchTimer) {
+        clearTimeout(this.searchTimer);
+        this.searchTimer = searchTimer;
+    }
+
+    #addObjectsArray(objectsArray) {
+        if(objectsArray && objectsArray.length > 0) {
+            this.nextPage = this.nextPage + 1;
+            let objectId = this.#getId(this.objectsArray[this.objectsArray.length - 1], this.idNames);
+            this.objectsArray = [...new Set(this.objectsArray.concat(objectsArray))];
+            this.updateObjectsList(this.excludeObjectsArray);
+            this.setObjectId(objectId);
+        }
+    }
+}
+
+class DataPointsSelect extends ObjectsSelect {
+
+    constructor (dataPointsSelectDef) {
+        let objectsSelectDef = {};
+        objectsSelectDef.excludeObjectsArray = dataPointsSelectDef.excludePointsArray || [];
+        objectsSelectDef.limit = dataPointsSelectDef.limit ? (dataPointsSelectDef.limit < 10 ? 10 : dataPointsSelectDef.limit) : 500;
+        objectsSelectDef.selectHtmlId = dataPointsSelectDef.selectHtmlId || "allPointsList";
+        objectsSelectDef.inputSelector = "#" + dataPointsSelectDef.selectHtmlId + "_chosen .chosen-search input";
+        objectsSelectDef.listSelector = "#" + dataPointsSelectDef.selectHtmlId + "_chosen .chosen-results";
+        objectsSelectDef.placeholderTextSingle = dataPointsSelectDef.placeholderTextSingle;
+        objectsSelectDef.objectsArray = dataPointsSelectDef.pointsArray || [];
+        objectsSelectDef.dataTypes = dataPointsSelectDef.dataTypes || [];
+        objectsSelectDef.altKey = dataPointsSelectDef.altKey || "id";
+        objectsSelectDef.altValue = dataPointsSelectDef.altValue || "name";
+        objectsSelectDef.invisibleEmptyOption = dataPointsSelectDef.invisibleEmptyOption || false;
+        objectsSelectDef.widthPx = dataPointsSelectDef.widthPx || "400px";
+        objectsSelectDef.imgAddHtmlIds = dataPointsSelectDef.imgAddHtmlIds || ["icon_comp_add", "icon_add"];
+        objectsSelectDef.nextPage = dataPointsSelectDef.nextPage || 1;
+        objectsSelectDef.keywordSearchLast = dataPointsSelectDef.keywordSearch || "";
+        objectsSelectDef.startAsEmpty = dataPointsSelectDef.startAsEmpty || false;
+        objectsSelectDef.settable = dataPointsSelectDef.pointSettable ? dataPointsSelectDef.pointSettable : "";
+        objectsSelectDef.endpoint = dataPointsSelectDef.endpoint || "api/datapoints/bean";
+        objectsSelectDef.idNames = dataPointsSelectDef.idNames || ["id", "dataPointId", "pointId", "key"];
+        super(objectsSelectDef);
+    }
+
+    getExcludePointsArray() {
+        return super.getExcludeObjectsArray();
+    }
+
+    getSelectHtmlId() {
+        return super.getSelectHtmlId();
+    }
+
+    getPointId() {
+        return super.getObjectId();
+    }
+
+    getPoint() {
+        return super.getObject();
+    }
+
+    getPointById(objectId) {
+        return super.getObjectById(objectId);
+    }
+
+    setDataTypes(dataTypes) {
+        return super.setDataTypes(dataTypes);
+    }
+
+    loadPointsList() {
+        return super.loadObjectsList();
+    }
+
+    setPointId(objectId) {
+        return super.setObjectId(objectId);
+    }
+
+    updatePointsList(excludeObjects) {
+        return super.updateObjectsList(excludeObjects);
+    }
 }
 
 function sizingField(lengthLimit, target, initWidth) {
@@ -1705,8 +2216,8 @@ function sizingField(lengthLimit, target, initWidth) {
     }
     if(target.value.length > lengthLimit) {
         if(target.style.width) {
-            var step = Math.floor(Math.random() * 10);
-            var temp = Number.parseInt((target.style.width + "").replace('px', '')) + step;
+            let step = 2 + Math.floor(Math.random() * 10);
+            let temp = Number.parseInt((target.style.width + "").replace('px', '')) + step;
             target.style.width = temp + "px";
         }
     }
@@ -1736,4 +2247,34 @@ function isSupported(browser, minVersion) {
         return major >= minVersion;
     }
     return false;
+}
+
+function convertToInt(value) {
+    try {
+        return value == 'undefined' || !value ? 0 : parseInt(value);
+    } catch(error) {
+        return 0;
+    }
+}
+
+function loadPointsSelects(selector, placeholderTextSingle) {
+    let pointsSelects = jQuery(selector);
+    for(let i=0; i < pointsSelects.length; i++) {
+        let dataPointsSelect = new DataPointsSelect({
+            selectHtmlId: pointsSelects[i].id,
+            placeholderTextSingle: placeholderTextSingle,
+            widthPx: "200px"
+        });
+    }
+}
+
+function executeOn(apply, arg1, arg2) {
+  if(arg1 && arg2) {
+    return apply(arg1, arg2);
+  } else if(arg1) {
+    return apply(arg1);
+  } else {
+    console.warn("Args not initialized for: ", [apply]);
+    return null;
+  }
 }
\ No newline at end of file
diff --git a/src/br/org/scadabr/view/component/ChartComparatorComponent.java b/src/br/org/scadabr/view/component/ChartComparatorComponent.java
index b469631a2f..363f4a64a1 100644
--- a/src/br/org/scadabr/view/component/ChartComparatorComponent.java
+++ b/src/br/org/scadabr/view/component/ChartComparatorComponent.java
@@ -5,22 +5,15 @@
 import java.io.ObjectOutputStream;
 import java.text.Format;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 import com.serotonin.json.JsonRemoteEntity;
 import com.serotonin.json.JsonRemoteProperty;
-import com.serotonin.mango.Common;
 import com.serotonin.mango.view.ImplDefinition;
 import com.serotonin.mango.view.component.HtmlComponent;
 import com.serotonin.mango.view.component.ViewComponent;
-import com.serotonin.mango.vo.User;
 import com.serotonin.util.SerializationHelper;
-import org.scada_lts.dao.DataPointDAO;
 import org.scada_lts.dao.model.ScadaObjectIdentifier;
-import org.scada_lts.permissions.service.GetDataPointsWithAccess;
 
 import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
 
@@ -65,15 +58,12 @@ public String createChartComparatorContent() {
 
 		StringBuilder sb = new StringBuilder();
 		// sb.append("<div style='width:" + width + "px; height:" + height
-		// + "px; border: 1px solid black;'>");
+		// + "px; border: 1px solid black;'>")
 		sb.append("<div>");
-		GetDataPointsWithAccess dataPointsWithAccess = new GetDataPointsWithAccess(new DataPointDAO());
-		User user = Common.getUser();
-		List<ScadaObjectIdentifier> dataPoints = dataPointsWithAccess.getObjectIdentifiersWithAccess(user);
-		sb.append(createDataPointsSelectComponent(idPrefix + "_dp1", dataPoints));
-		sb.append(createDataPointsSelectComponent(idPrefix + "_dp2", dataPoints));
-		sb.append(createDataPointsSelectComponent(idPrefix + "_dp3", dataPoints));
-		sb.append(createDataPointsSelectComponent(idPrefix + "_dp4", dataPoints));
+		sb.append(createDataPointsSelectComponent(idPrefix + "_dp1", Collections.emptyList()));
+		sb.append(createDataPointsSelectComponent(idPrefix + "_dp2", Collections.emptyList()));
+		sb.append(createDataPointsSelectComponent(idPrefix + "_dp3", Collections.emptyList()));
+		sb.append(createDataPointsSelectComponent(idPrefix + "_dp4", Collections.emptyList()));
 		sb.append("<div style='float:right;'><input type='button' style='width: 100%;' value='Atualizar' onclick=\"updateChartComparatorComponent('"
 				+ idPrefix + "'," + width + "," + height + ");\" /> </div>");
 		sb.append("<div style='clear:both;'> </div>");
diff --git a/src/br/org/scadabr/web/dwr/ScriptsDwr.java b/src/br/org/scadabr/web/dwr/ScriptsDwr.java
index 0510579eff..7bd16bf83a 100644
--- a/src/br/org/scadabr/web/dwr/ScriptsDwr.java
+++ b/src/br/org/scadabr/web/dwr/ScriptsDwr.java
@@ -1,5 +1,6 @@
 package br.org.scadabr.web.dwr;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import br.org.scadabr.rt.scripting.ScriptRT;
@@ -10,13 +11,16 @@
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.DataPointExtendedNameComparator;
 import com.serotonin.mango.vo.DataPointVO;
+import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.permission.Permissions;
 import com.serotonin.mango.web.dwr.BaseDwr;
+import com.serotonin.mango.web.dwr.beans.DataPointBean;
 import com.serotonin.web.dwr.DwrResponseI18n;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.mango.service.DataPointService;
 import org.scada_lts.mango.service.ScriptService;
+import org.scada_lts.utils.GetDataPointsUtils;
 
 import static com.serotonin.mango.util.LoggingScriptUtils.infoErrorExecutionScript;
 
@@ -91,4 +95,19 @@ public boolean executeScript(int scriptId) {
 
 		return false;
 	}
+
+	public DwrResponseI18n getScriptResponse(int id) {
+		DwrResponseI18n response = new DwrResponseI18n();
+
+		User user = Common.getUser();
+		ScriptVO<?> scriptVO = getScript(id);
+
+		List<DataPointBean> dataPoints = new ArrayList<>();
+		if(scriptVO instanceof ContextualizedScriptVO) {
+			dataPoints.addAll(GetDataPointsUtils.getDataPointsByScript(user, (ContextualizedScriptVO) scriptVO, new DataPointService()));
+		}
+		response.addData("script",scriptVO);
+		response.addData("dataPoints", dataPoints);
+		return response;
+	}
 }
diff --git a/src/com/serotonin/mango/Common.java b/src/com/serotonin/mango/Common.java
index a8fff86a08..113e5d0042 100644
--- a/src/com/serotonin/mango/Common.java
+++ b/src/com/serotonin/mango/Common.java
@@ -262,6 +262,7 @@ public static void setUser(HttpServletRequest request, User user) {
 		request.getSession().setAttribute(SESSION_USER, user);
 	}
 
+	@Deprecated(since = "2.8.1")
 	public static void updateUserInSession(HttpServletRequest request, User user) {
 		User loggedUser = getUser(request);
 		List<GrantedAuthority> roles = loggedUser.getAttribute("roles");
diff --git a/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java
index cf916fd616..ad47ce1908 100644
--- a/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java
@@ -223,7 +223,7 @@ public void addDataPoint(DataPointRT dataPoint) {
 
         // Check if the remote device is in the local list yet.
         RemoteDevice d = localDevice.getRemoteDevice(address, network);
-        if (d == null) {
+        if (!isReadyDevice(d)) {
             // Send a whois to get remote device data.
             try {
                 localDevice.sendUnconfirmed(address, null, new WhoIsRequest());
@@ -248,12 +248,12 @@ public void addDataPoint(DataPointRT dataPoint) {
 
                 // Check again for the device
                 d = localDevice.getRemoteDevice(address, network);
-                if (d != null)
+                if (isReadyDevice(d))
                     break;
             }
         }
 
-        if (d == null) {
+        if (!isReadyDevice(d)) {
             // If we still don't have the device, try to get it manually.
             try {
                 d = localDevice.findRemoteDevice(address, network, locator.getRemoteDeviceInstanceNumber());
@@ -269,7 +269,7 @@ public void addDataPoint(DataPointRT dataPoint) {
             }
         }
 
-        if (d == null) {
+        if (!isReadyDevice(d)) {
             // If we still don't have the device, call it in.
             fireDeviceExceptionEvent(dataPoint,"event.bacnet.deviceError", address.toIpString());
             disablePoint(dataPoint);
@@ -819,4 +819,8 @@ private boolean isInitialized(LocalDevice localDevice) {
     public int getUpdateTimeExceededUpdatePeriodEventId() {
         return UPDATE_TIME_EXCEEDED_UPDATE_PERIOD_EXCEPTION_EVENT;
     }
+
+    private boolean isReadyDevice(RemoteDevice d) {
+        return d != null && d.getSegmentationSupported() != null;
+    }
 }
diff --git a/src/com/serotonin/mango/rt/dataSource/meta/MetaPointLocatorRT.java b/src/com/serotonin/mango/rt/dataSource/meta/MetaPointLocatorRT.java
index bae18f3f5f..6e0d52be47 100644
--- a/src/com/serotonin/mango/rt/dataSource/meta/MetaPointLocatorRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/meta/MetaPointLocatorRT.java
@@ -297,7 +297,7 @@ private void execute(long runtime, List<Integer> sourceIds, boolean initializeMo
             handleRecursiveError(runtime, dataPoint, new LocalizableMessage("event.meta.recursionFailure"));
             String msg = MessageFormat.format("Recursion failure: exceeded MAX_RECURSION: expected <= {0} but was {1}, Context: {2}",
                     String.valueOf(MAX_RECURSION), count, generateContext(dataPoint, dataSource));
-            LOG.warn(msg);
+            LOG.error(msg);
             return;
         } else {
             returnToNormalRecursive(runtime, dataPoint);
@@ -318,13 +318,13 @@ else if(isUpdatePoint(initializeMode, valueTime, previousValueTime, vo))
                     doUpdate(valueTime, dataPoint);
             } catch (ScriptException e) {
                 handleScriptError(runtime, dataPoint, new LocalizableMessage("common.default", e.getLocalizedMessage()));
-                LOG.warn(infoErrorExecutionScript(e, dataPoint, dataSource));
+                LOG.error(infoErrorExecutionScript(e, dataPoint, dataSource));
             } catch (ResultTypeException e) {
                 handleTypeError(runtime, dataPoint, e.getLocalizableMessage());
-                LOG.warn(infoErrorExecutionScript(e, dataPoint, dataSource));
+                LOG.error(infoErrorExecutionScript(e, dataPoint, dataSource));
             } catch (Exception e) {
                 handleScriptError(runtime, dataPoint, new LocalizableMessage("common.default", e.getMessage()));
-                LOG.warn(infoErrorExecutionScript(e, dataPoint, dataSource));
+                LOG.error(infoErrorExecutionScript(e, dataPoint, dataSource));
             }
         }
         finally {
@@ -340,7 +340,7 @@ protected Map<String, IDataPoint> createContext(DataPointRT dataPoint) {
             returnToNormalContext(System.currentTimeMillis(), dataPoint);
             return context;
         } catch (Exception e) {
-            LOG.warn(infoErrorInitializationScript(e, dataPoint, dataSource));
+            LOG.error(infoErrorInitializationScript(e, dataPoint, dataSource));
             return null;
         }
     }
diff --git a/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java b/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java
index b923462ad0..a54e5be8e1 100644
--- a/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java
+++ b/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java
@@ -211,7 +211,7 @@ public PointValueTime execute(String script,
 					}
 
 				} catch (Exception e) {
-					LOG.error("Error evaluating string (script): "
+					LOG.warn("Error evaluating string (script): "
 							+ e.getMessage());
 					throw new ScriptException(e.getMessage());
 				}
@@ -274,7 +274,7 @@ else if (dataTypeId == DataTypes.ALPHANUMERIC)
 				try {
 					result = cx.evaluateString(scope, script, "<cmd>", 1, null);
 				} catch (Exception e) {
-					LOG.error("Error evaluating string (script): "
+					LOG.warn("Error evaluating string (script): "
 							+ e.getMessage());
 					throw new ScriptException(e.getMessage());
 				}
diff --git a/src/com/serotonin/mango/view/component/CompoundComponent.java b/src/com/serotonin/mango/view/component/CompoundComponent.java
index 48fc0c4fd9..31ff0e524d 100644
--- a/src/com/serotonin/mango/view/component/CompoundComponent.java
+++ b/src/com/serotonin/mango/view/component/CompoundComponent.java
@@ -347,4 +347,8 @@ public String toString() {
                 ", visible=" + visible +
                 "} " + super.toString();
     }
+
+    public int[] getSupportedDataTypes() {
+        return definition().getSupportedDataTypes() == null ? new int[]{} : definition().getSupportedDataTypes();
+    }
 }
diff --git a/src/com/serotonin/mango/view/component/EnhancedImageChartComponent.java b/src/com/serotonin/mango/view/component/EnhancedImageChartComponent.java
index 61dcd7f013..7b2f5a67c9 100644
--- a/src/com/serotonin/mango/view/component/EnhancedImageChartComponent.java
+++ b/src/com/serotonin/mango/view/component/EnhancedImageChartComponent.java
@@ -12,11 +12,12 @@
 import com.serotonin.json.JsonRemoteProperty;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.DataTypes;
-import com.serotonin.mango.rt.dataImage.PointValueFacade;
 import com.serotonin.mango.rt.dataImage.PointValueTime;
 import com.serotonin.mango.util.LocalizableJsonException;
 import com.serotonin.mango.view.ImplDefinition;
 
+import static org.scada_lts.utils.GetDataPointValuesUtils.getDataPointValues;
+
 /**
  * Component for Enhanced Image Chart.
  * 
@@ -172,7 +173,7 @@ public String generateImageChartData(boolean getDataForStatic) {
         long to = System.currentTimeMillis();
         long from = to - Common.getMillis(durationType, durationPeriods);
 
-        Map<Long, Number[]> data = new TreeMap<Long, Number[]>();
+        Map<Long, Object[]> data = new TreeMap<>();
 
         List<CompoundChild> children = getChildComponents();
         int childCount = nonEmptyChildrenCount();
@@ -180,13 +181,12 @@ public String generateImageChartData(boolean getDataForStatic) {
         for (CompoundChild child : children) {
             int dataPointId = ((EnhancedPointComponent) child.getViewComponent()).getDataPointId();
             if (dataPointId != 0) {
-                PointValueFacade pointValueFacade = new PointValueFacade(dataPointId);
-                List<PointValueTime> pointData = pointValueFacade.getPointValuesBetween(from, to);
+                List<PointValueTime> pointData = getDataPointValues(from, to, dataPointId);
                 for (PointValueTime val : pointData) {
                     if (data.get(val.getTime()) == null) {
-                        data.put(val.getTime(), new Number[childCount]);
+                        data.put(val.getTime(), new Object[childCount]);
                     }
-                    data.get(val.getTime())[j] = val.getValue().numberValue();
+                    data.get(val.getTime())[j] = getObject(val.getValue().getObjectValue());
                 }
                 j++;
             }
@@ -196,7 +196,7 @@ public String generateImageChartData(boolean getDataForStatic) {
 
         for (Long time : data.keySet()) {
             csv.append(time);
-            for (Number val : data.get(time)) {
+            for (Object val : data.get(time)) {
                 csv.append(",").append(val == null ? "" : val);
             }
             csv.append("\n");
@@ -307,4 +307,8 @@ public String toString() {
                 ", enhancedImageChartType=" + enhancedImageChartType +
                 "} " + super.toString();
     }
+
+    private static Object getObject(Object object) {
+        return object instanceof Boolean ? ((Boolean) object ? 1 : 0) : object;
+    }
 }
diff --git a/src/com/serotonin/mango/view/component/PointComponent.java b/src/com/serotonin/mango/view/component/PointComponent.java
index 4a63b7a985..d3fa4fcc93 100644
--- a/src/com/serotonin/mango/view/component/PointComponent.java
+++ b/src/com/serotonin/mango/view/component/PointComponent.java
@@ -90,7 +90,7 @@ public void validateDataPoint(User user, boolean makeReadOnly) {
         } else {
             visible = Permissions.hasDataPointReadPermission(user, dataPoint);
             valid = definition().supports(dataPoint.getPointLocator().getDataTypeId());
-            settableOverride = !makeReadOnly && Permissions.hasDataPointSetPermission(user, dataPoint);
+            settableOverride = !makeReadOnly && Permissions.hasDataPointSetPermission(user, dataPoint) && settableOverride;
         }
     }
 
diff --git a/src/com/serotonin/mango/view/component/ScriptComponent.java b/src/com/serotonin/mango/view/component/ScriptComponent.java
index dd79fd5adb..cba479c025 100644
--- a/src/com/serotonin/mango/view/component/ScriptComponent.java
+++ b/src/com/serotonin/mango/view/component/ScriptComponent.java
@@ -98,7 +98,7 @@ public void addDataToModel(Map<String, Object> model, PointValueTime value) {
 		if(!ScriptValidatorUtils.validate(script)) {
 			ScriptException scriptException = new ScriptException("Script no valid");
 			result = ScriptExecutor.prettyScriptMessage(scriptException).getMessage();
-			LOG.warn(infoErrorExecutionScript(scriptException, model, this));
+			LOG.error(infoErrorExecutionScript(scriptException, model, this));
 			model.put("scriptContent", result);
 			return;
 		}
@@ -149,11 +149,11 @@ public void addDataToModel(Map<String, Object> model, PointValueTime value) {
 						result = o.toString();
 
 					if(o instanceof Undefined) {
-						LOG.warn(infoErrorExecutionScript(model, this));
+						LOG.error(infoErrorExecutionScript(model, this));
 					}
 				} catch (Exception e) {
 					result = ScriptExecutor.prettyScriptMessage(new ScriptException(e)).getMessage();
-					LOG.warn(infoErrorExecutionScript(e, model, this));
+					LOG.error(infoErrorExecutionScript(e, model, this));
 				}
 			} finally {
 				Context.exit();
diff --git a/src/com/serotonin/mango/vo/DataPointVO.java b/src/com/serotonin/mango/vo/DataPointVO.java
index a7b4583bb5..75656712c5 100644
--- a/src/com/serotonin/mango/vo/DataPointVO.java
+++ b/src/com/serotonin/mango/vo/DataPointVO.java
@@ -1162,6 +1162,7 @@ public DataPointIdentifier toIdentifier() {
                     .enabled(isEnabled())
                     .description(getDescription())
                     .dataSourceName(getDataSourceName())
+                    .settable(isSettable())
                     .build();
         return DataPointIdentifier.builder(PointDataType.byCode(getPointLocator().getDataTypeId()))
                 .id(getId())
@@ -1171,6 +1172,7 @@ public DataPointIdentifier toIdentifier() {
                 .enabled(isEnabled())
                 .description(getDescription())
                 .dataSourceName(getDataSourceName())
+                .settable(getPointLocator().isSettable())
                 .build();
     }
 }
diff --git a/src/com/serotonin/mango/vo/PointDataType.java b/src/com/serotonin/mango/vo/PointDataType.java
index 4549edc510..c6671d9b45 100644
--- a/src/com/serotonin/mango/vo/PointDataType.java
+++ b/src/com/serotonin/mango/vo/PointDataType.java
@@ -1,7 +1,10 @@
 package com.serotonin.mango.vo;
 
+import com.serotonin.mango.Common;
 import com.serotonin.mango.DataTypes;
+import com.serotonin.web.i18n.LocalizableMessage;
 
+import java.util.ResourceBundle;
 import java.util.stream.Stream;
 
 public enum PointDataType {
@@ -23,6 +26,12 @@ public int getCode() {
         return code;
     }
 
+    public String getMessageText() {
+        LocalizableMessage localizableMessage = DataTypes.getDataTypeMessage(code);
+        ResourceBundle bundle = Common.getBundle();
+        return localizableMessage.getLocalizedMessage(bundle);
+    }
+
     public static PointDataType byCode(int code) {
         return Stream.of(PointDataType.values())
                 .filter(a -> a.getCode() == code)
diff --git a/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java b/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java
index f0c79810b9..f420220b59 100644
--- a/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java
+++ b/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java
@@ -214,6 +214,7 @@
 import org.scada_lts.serial.SerialPortParameters;
 import org.scada_lts.serial.SerialPortService;
 import org.scada_lts.serial.SerialPortWrapperAdapter;
+import org.scada_lts.utils.GetDataPointsUtils;
 import org.scada_lts.utils.SystemSettingsUtils;
 import org.scada_lts.utils.TimeLocker;
 
@@ -222,6 +223,7 @@
 import static com.serotonin.mango.util.LoggingScriptUtils.infoErrorExecutionScript;
 import static com.serotonin.mango.util.SqlDataSourceUtils.createSqlDataSourceVO;
 import static org.scada_lts.utils.AlarmLevelsDwrUtils.*;
+import static org.scada_lts.utils.GetDataPointsUtils.getContextPoints;
 import static org.scada_lts.utils.PathSecureUtils.toSecurePath;
 import static org.scada_lts.utils.XidUtils.validateXid;
 
@@ -238,10 +240,11 @@ public class DataSourceEditDwr extends DataSourceListDwr {
 	// Common methods
 	//
 	//
-	public DwrResponseI18n editInit() {
+	public DwrResponseI18n editInit(int dataSourceId) {
         Permissions.ensureAdmin();
+        User user = Common.getUser();
 		DwrResponseI18n response = new DwrResponseI18n();
-		response.addData("points", getPoints());
+		response.addData("points", GetDataPointsUtils.getDataPointsByDataSource(user, dataSourceId, new DataPointService()));
 		response.addData("alarms", getAlarms());
 		return response;
 	}
@@ -318,6 +321,22 @@ public DataPointVO getPoint(int pointId) {
         return getPoint(pointId, null);
     }
 
+    public DwrResponseI18n getPointResponse(int pointId) {
+        DataPointVO dataPoint = getPoint(pointId, null);
+        DwrResponseI18n response = new DwrResponseI18n();
+        response.addData("point", dataPoint);
+
+        if(dataPoint != null && dataPoint.getPointLocator() instanceof MetaPointLocatorVO) {
+            MetaPointLocatorVO locator = dataPoint.getPointLocator();
+            User user = Common.getUser();
+            DataPointService dataPointService = new DataPointService();
+            List<DataPointBean> contextPoints = getContextPoints(locator, user, dataPointService);
+            response.addData("contextPoints", contextPoints);
+        }
+
+        return response;
+    }
+
     private DataPointVO getPoint(int pointId, DataPointDefaulter defaulter) {
         Permissions.ensureAdmin();
         DataSourceVO<?> ds = Common.getUser().getEditDataSource();
@@ -360,7 +379,8 @@ public List<DataPointVO> deletePoint(int id) {
             Common.ctx.getRuntimeManager().deleteDataPoint(dp);
         UsersProfileService usersProfileService = new UsersProfileService();
         usersProfileService.updateDataPointPermissions();
-        return getPoints();
+        User user = Common.getUser();
+        return dp == null ? getPoints() : GetDataPointsUtils.getDataPointsByDataSource(user, dp.getDataSourceId(), new DataPointService());
     }
 
     //
@@ -373,8 +393,11 @@ public Map<String, Object> toggleEditDataSource() {
     //
     public DwrResponseI18n togglePoint(int dataPointId) {
         Permissions.ensureAdmin();
-        DwrResponseI18n response = super.toggleDataPoint(dataPointId);
-        response.addData("points", getPoints());
+        User user = Common.getUser();
+        DataPointService dataPointService = new DataPointService();
+        DataPointVO dataPoint = dataPointService.getDataPoint(dataPointId);
+        DwrResponseI18n response = super.toggleDataPoint(dataPoint);
+        response.addData("points", GetDataPointsUtils.getDataPointsByDataSource(user, dataPoint.getDataSourceId(), dataPointService));
         return response;
     }
 
@@ -1153,7 +1176,15 @@ public DwrResponseI18n saveMetaDataSource(String name, String xid) {
     
     public DwrResponseI18n saveMetaPointLocator(int id, String xid,
                                                 String name, MetaPointLocatorVO locator) {
-        return validatePoint(id, xid, name, locator, null);
+
+        DwrResponseI18n response = validatePoint(id, xid, name, locator, null);
+
+        User user = Common.getUser();
+        DataPointService dataPointService = new DataPointService();
+        List<DataPointBean> contextPoints = getContextPoints(locator, user, dataPointService);
+        response.addData("contextPoints", contextPoints);
+        response.addData("locator", locator);
+        return response;
     }
 
     
@@ -1786,7 +1817,7 @@ public EBI25InterfaceReader ebi25ReadInterface(String host, int port,
 
         if (reader.getErrorMessage() == null) {
             tryDataSourceSave(ds);
-            reader.setPoints(getPoints());
+            reader.setPoints(GetDataPointsUtils.getDataPointsByDataSource(user, ds.getId(), new DataPointService()));
         }
 
         return reader;
@@ -2999,12 +3030,13 @@ public DwrResponseI18n copyDataPoint(final int dataSourceId, final int dataPoint
         DataPointVO dataPoint = dataPointService.getDataPoint(dataPointId);
         DwrResponseI18n response = new DwrResponseI18n();
         if(dataPoint != null) {
-            DataPointVO dataPointCopy = copyAndSaveDataPoint(dataSource, dataPoint, new DataPointService());
+            DataPointVO dataPointCopy = copyAndSaveDataPoint(dataSource, dataPoint, dataPointService);
             response.addData("id", dataPointCopy.getId());
         } else {
             response.addData("id", -1);
         }
-        response.addData("points", getPoints());
+        User user = Common.getUser();
+        response.addData("points", GetDataPointsUtils.getDataPointsByDataSource(user, dataSourceId, dataPointService));
         return response;
     }
     public String getObjectTypeName(int objectTypeId) {
diff --git a/src/com/serotonin/mango/web/dwr/DataSourceListDwr.java b/src/com/serotonin/mango/web/dwr/DataSourceListDwr.java
index 5dfdbf7cd7..01ca5b5a2c 100644
--- a/src/com/serotonin/mango/web/dwr/DataSourceListDwr.java
+++ b/src/com/serotonin/mango/web/dwr/DataSourceListDwr.java
@@ -123,6 +123,10 @@ public int deleteDataSource(int dataSourceId) {
 
 	public DwrResponseI18n toggleDataPoint(int dataPointId) {
 		DataPointVO dataPoint = new DataPointDao().getDataPoint(dataPointId);
+		return toggleDataPoint(dataPoint);
+	}
+
+	public DwrResponseI18n toggleDataPoint(DataPointVO dataPoint) {
 		Permissions.ensureDataSourcePermission(Common.getUser(),
 				dataPoint.getDataSourceId());
 
@@ -131,7 +135,7 @@ public DwrResponseI18n toggleDataPoint(int dataPointId) {
 		runtimeManager.saveDataPoint(dataPoint);
 
 		DwrResponseI18n response = new DwrResponseI18n();
-		response.addData("id", dataPointId);
+		response.addData("id", dataPoint.getId());
 		response.addData("enabled", dataPoint.isEnabled());
 		return response;
 	}
diff --git a/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java b/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java
index 7f2d8740ac..7719581261 100644
--- a/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java
+++ b/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java
@@ -19,11 +19,7 @@
 package com.serotonin.mango.web.dwr;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
@@ -31,18 +27,11 @@
 import org.directwebremoting.WebContextFactory;
 
 import com.serotonin.mango.Common;
-import com.serotonin.mango.db.dao.CompoundEventDetectorDao;
-import com.serotonin.mango.db.dao.DataPointDao;
-import com.serotonin.mango.db.dao.DataSourceDao;
-import com.serotonin.mango.db.dao.MaintenanceEventDao;
-import com.serotonin.mango.db.dao.PublisherDao;
-import com.serotonin.mango.db.dao.ScheduledEventDao;
 import com.serotonin.mango.rt.dataImage.types.MangoValue;
 import com.serotonin.mango.rt.event.type.AuditEventType;
 import com.serotonin.mango.rt.event.type.SystemEventType;
 import com.serotonin.mango.rt.maint.work.ProcessWorkItem;
 import com.serotonin.mango.view.text.TextRenderer;
-import com.serotonin.mango.vo.DataPointExtendedNameComparator;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.dataSource.DataSourceVO;
@@ -55,7 +44,6 @@
 import com.serotonin.mango.vo.permission.Permissions;
 import com.serotonin.mango.vo.publish.PublishedPointVO;
 import com.serotonin.mango.vo.publish.PublisherVO;
-import com.serotonin.mango.web.dwr.beans.DataPointBean;
 import com.serotonin.mango.web.dwr.beans.EventSourceBean;
 import com.serotonin.mango.web.dwr.beans.RecipientListEntryBean;
 
@@ -68,7 +56,9 @@
 import org.scada_lts.mango.service.UserService;
 import org.scada_lts.serorepl.utils.StringUtils;
 import org.scada_lts.web.mvc.api.dto.MailingListJson;
+import org.scada_lts.mango.service.*;
 
+import static org.scada_lts.utils.GetDataPointsUtils.getDataPointsByEventHandlers;
 
 public class EventHandlersDwr extends BaseDwr {
 	private static final Log LOG = LogFactory.getLog(EventHandlersDwr.class);
@@ -80,61 +70,59 @@ public Map<String, Object> getInitData() {
 		User user = Common.getUser();
 		Permissions.ensureAdmin(user);
 
-		EventService eventDao = new EventService();
+		EventService eventService = new EventService();
 		Map<String, Object> model = new HashMap<String, Object>();
 
 		// Get the data points
-		List<DataPointBean> allPoints = new ArrayList<DataPointBean>();
-		List<EventSourceBean> dataPoints = new ArrayList<EventSourceBean>();
-		List<DataPointVO> dps = new DataPointDao().getDataPoints(
-				DataPointExtendedNameComparator.instance, true);
-		for (DataPointVO dp : dps) {
+		DataPointService dataPointService = new DataPointService();
+		List<EventSourceBean> eventSource = new ArrayList<>();
+
+		List<DataPointVO> dataPoints = dataPointService.getDataPointsWithAccess(user, true);
+		for (DataPointVO dp : dataPoints) {
 			if (!Permissions
 					.hasDataSourcePermission(user, dp.getDataSourceId()))
 				continue;
 
-			allPoints.add(new DataPointBean(dp));
-
-			if (dp.getEventDetectors().size() > 0) {
+			if (dp.getEventDetectors() != null && !dp.getEventDetectors().isEmpty()) {
 				EventSourceBean source = new EventSourceBean();
 				source.setId(dp.getId());
 				source.setName(dp.getExtendedName());
 
 				for (PointEventDetectorVO ped : dp.getEventDetectors()) {
 					EventTypeVO dpet = ped.getEventType();
-					dpet.setHandlers(eventDao.getEventHandlers(dpet));
+					dpet.setHandlers(eventService.getEventHandlers(dpet));
 					source.getEventTypes().add(dpet);
 				}
 
-				dataPoints.add(source);
+				eventSource.add(source);
 			}
 		}
 
 		// Get the scheduled events
 		List<EventTypeVO> scheduledEvents = new ArrayList<EventTypeVO>();
-		List<ScheduledEventVO> ses = new ScheduledEventDao()
+		List<ScheduledEventVO> ses = new ScheduledEventService()
 				.getScheduledEvents();
 		for (ScheduledEventVO se : ses) {
 			EventTypeVO et = se.getEventType();
-			et.setHandlers(eventDao.getEventHandlers(et));
+			et.setHandlers(eventService.getEventHandlers(et));
 			scheduledEvents.add(et);
 		}
 		model.put("scheduledEvents", scheduledEvents);
 
 		// Get the compound event detectors
 		List<EventTypeVO> compoundEvents = new ArrayList<EventTypeVO>();
-		List<CompoundEventDetectorVO> ceds = new CompoundEventDetectorDao()
+		List<CompoundEventDetectorVO> ceds = new CompoundEventDetectorService()
 				.getCompoundEventDetectors();
 		for (CompoundEventDetectorVO ced : ceds) {
 			EventTypeVO et = ced.getEventType();
-			et.setHandlers(eventDao.getEventHandlers(et));
+			et.setHandlers(eventService.getEventHandlers(et));
 			compoundEvents.add(et);
 		}
 		model.put("compoundEvents", compoundEvents);
 
 		// Get the data sources
 		List<EventSourceBean> dataSources = new ArrayList<EventSourceBean>();
-		for (DataSourceVO<?> ds : new DataSourceDao().getDataSources()) {
+		for (DataSourceVO<?> ds : new DataSourceService().getDataSources()) {
 			if (!Permissions.hasDataSourcePermission(user, ds.getId()))
 				continue;
 
@@ -144,7 +132,7 @@ public Map<String, Object> getInitData() {
 				source.setName(ds.getName());
 
 				for (EventTypeVO dset : ds.getEventTypes()) {
-					dset.setHandlers(eventDao.getEventHandlers(dset));
+					dset.setHandlers(eventService.getEventHandlers(dset));
 					source.getEventTypes().add(dset);
 				}
 
@@ -155,7 +143,7 @@ public Map<String, Object> getInitData() {
 		if (Permissions.hasAdmin(user)) {
 			// Get the publishers
 			List<EventSourceBean> publishers = new ArrayList<EventSourceBean>();
-			for (PublisherVO<? extends PublishedPointVO> p : new PublisherDao()
+			for (PublisherVO<? extends PublishedPointVO> p : new PublisherService()
 					.getPublishers(new PublisherService.PublisherNameComparator())) {
 				if (p.getEventTypes().size() > 0) {
 					EventSourceBean source = new EventSourceBean();
@@ -163,7 +151,7 @@ public Map<String, Object> getInitData() {
 					source.setName(p.getName());
 
 					for (EventTypeVO pet : p.getEventTypes()) {
-						pet.setHandlers(eventDao.getEventHandlers(pet));
+						pet.setHandlers(eventService.getEventHandlers(pet));
 						source.getEventTypes().add(pet);
 					}
 
@@ -174,11 +162,11 @@ public Map<String, Object> getInitData() {
 
 			// Get the maintenance events
 			List<EventTypeVO> maintenanceEvents = new ArrayList<EventTypeVO>();
-			List<MaintenanceEventVO> mes = new MaintenanceEventDao()
+			List<MaintenanceEventVO> mes = new MaintenanceEventService()
 					.getMaintenanceEvents();
 			for (MaintenanceEventVO me : mes) {
 				EventTypeVO et = me.getEventType();
-				et.setHandlers(eventDao.getEventHandlers(et));
+				et.setHandlers(eventService.getEventHandlers(et));
 				maintenanceEvents.add(et);
 			}
 			model.put("maintenanceEvents", maintenanceEvents);
@@ -186,7 +174,7 @@ public Map<String, Object> getInitData() {
 			// Get the system events
 			List<EventTypeVO> systemEvents = new ArrayList<EventTypeVO>();
 			for (EventTypeVO sets : SystemEventType.getSystemEventTypes()) {
-				sets.setHandlers(eventDao.getEventHandlers(sets));
+				sets.setHandlers(eventService.getEventHandlers(sets));
 				systemEvents.add(sets);
 			}
 			model.put("systemEvents", systemEvents);
@@ -194,7 +182,7 @@ public Map<String, Object> getInitData() {
 			// Get the audit events
 			List<EventTypeVO> auditEvents = new ArrayList<EventTypeVO>();
 			for (EventTypeVO aets : AuditEventType.getAuditEventTypes()) {
-				aets.setHandlers(eventDao.getEventHandlers(aets));
+				aets.setHandlers(eventService.getEventHandlers(aets));
 				auditEvents.add(aets);
 			}
 			model.put("auditEvents", auditEvents);
@@ -212,8 +200,8 @@ public Map<String, Object> getInitData() {
 				.collect(Collectors.toList());
 		model.put("users", users);
 
-		model.put("allPoints", allPoints);
-		model.put("dataPoints", dataPoints);
+		model.put("allPoints", getDataPointsByEventHandlers());
+		model.put("dataPoints", eventSource);
 		model.put("dataSources", dataSources);
 
 		return model;
@@ -221,7 +209,7 @@ public Map<String, Object> getInitData() {
 
 	public String createSetValueContent(int pointId, String valueStr,
 			String idSuffix) {
-		DataPointVO pointVO = new DataPointDao().getDataPoint(pointId);
+		DataPointVO pointVO = new DataPointService().getDataPoint(pointId);
 		Permissions.ensureDataSourcePermission(Common.getUser(),
 				pointVO.getDataSourceId());
 
@@ -346,6 +334,8 @@ private DwrResponseI18n save(int eventSourceId, int eventTypeRef1,
 			response.addData("handler", handler);
 		}
 
+		response.getData().put("allPoints", getDataPointsByEventHandlers());
+
 		return response;
 	}
 
diff --git a/src/com/serotonin/mango/web/dwr/PointLinksDwr.java b/src/com/serotonin/mango/web/dwr/PointLinksDwr.java
index 215d8734f6..8f35b645a6 100644
--- a/src/com/serotonin/mango/web/dwr/PointLinksDwr.java
+++ b/src/com/serotonin/mango/web/dwr/PointLinksDwr.java
@@ -18,14 +18,10 @@
  */
 package com.serotonin.mango.web.dwr;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.script.ScriptException;
 
-import com.serotonin.db.IntValuePair;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.db.dao.DataPointDao;
 import com.serotonin.mango.db.dao.PointLinkDao;
@@ -35,60 +31,58 @@
 import com.serotonin.mango.rt.dataSource.meta.ResultTypeException;
 import com.serotonin.mango.rt.dataSource.meta.ScriptExecutor;
 import com.serotonin.mango.rt.link.PointLinkRT;
-import com.serotonin.mango.vo.DataPointExtendedNameComparator;
-import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.link.PointLinkVO;
 import com.serotonin.mango.vo.permission.Permissions;
-import com.serotonin.util.StringUtils;
+import com.serotonin.mango.web.dwr.beans.DataPointBean;
 import com.serotonin.web.dwr.DwrResponseI18n;
 import com.serotonin.web.i18n.LocalizableMessage;
 import com.serotonin.web.taglib.DateFunctions;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.mango.service.PointLinkService;
 
 import static com.serotonin.mango.util.LoggingScriptUtils.infoErrorExecutionScript;
+import static org.scada_lts.utils.GetDataPointsUtils.getSourceDataPointsByPointLinks;
+import static org.scada_lts.utils.GetDataPointsUtils.getTargetDataPointsByPointLinks;
 
 /**
  * @author Matthew Lohbihler
  */
 public class PointLinksDwr extends BaseDwr {
     private static final Log LOG = LogFactory.getLog(PointLinksDwr.class);
-    public Map<String, Object> init() {
+    public DwrResponseI18n init() {
         User user = Common.getUser();
         Permissions.ensureAdmin(user);
-        Map<String, Object> data = new HashMap<String, Object>();
+        Map<String, Object> data = new HashMap<>();
 
         // Get the points that this user can access.
-        List<DataPointVO> allPoints = new DataPointDao().getDataPoints(DataPointExtendedNameComparator.instance, false);
-        List<IntValuePair> sourcePoints = new ArrayList<IntValuePair>();
-        List<IntValuePair> targetPoints = new ArrayList<IntValuePair>();
-        for (DataPointVO point : allPoints) {
-            if (Permissions.hasDataPointReadPermission(user, point))
-                sourcePoints.add(new IntValuePair(point.getId(), point.getExtendedName()));
-            if (point.getPointLocator().isSettable() && Permissions.hasDataPointSetPermission(user, point))
-                targetPoints.add(new IntValuePair(point.getId(), point.getExtendedName()));
-        }
-
-        data.put("sourcePoints", sourcePoints);
-        data.put("targetPoints", targetPoints);
+        List<PointLinkVO> pointLinks = new PointLinkService().getPointLinks();
+        DataPointService dataPointService = new DataPointService();
+        Set<DataPointBean> sourcePoints = getSourceDataPointsByPointLinks(user, pointLinks, dataPointService);
+        Set<DataPointBean> targetPoints = getTargetDataPointsByPointLinks(user, pointLinks, dataPointService);
 
         // Get the existing point links.
-        List<PointLinkVO> pointLinks = new ArrayList<PointLinkVO>();
+        List<PointLinkVO> existPointLinks = new ArrayList<>();
         for (PointLinkVO pointLink : new PointLinkDao().getPointLinks()) {
             if (containsPoint(sourcePoints, pointLink.getSourcePointId())
                     && containsPoint(targetPoints, pointLink.getTargetPointId()))
-                pointLinks.add(pointLink);
+                existPointLinks.add(pointLink);
         }
 
-        data.put("pointLinks", pointLinks);
-
-        return data;
+        DwrResponseI18n response = new DwrResponseI18n();
+        response.addData("sourcePoints", sourcePoints);
+        response.addData("targetPoints", targetPoints);
+        response.addData("pointLinks", existPointLinks);
+        return response;
     }
 
-    private boolean containsPoint(List<IntValuePair> pointList, int pointId) {
-        for (IntValuePair ivp : pointList) {
-            if (ivp.getKey() == pointId)
+
+
+    private boolean containsPoint(Set<DataPointBean> pointList, int pointId) {
+        for (DataPointBean ivp : pointList) {
+            if (ivp.getId() == pointId)
                 return true;
         }
         return false;
@@ -120,7 +114,6 @@ public DwrResponseI18n savePointLink(int id, String xid, int sourcePointId, int
         vo.setDisabled(disabled);
 
         DwrResponseI18n response = new DwrResponseI18n();
-        PointLinkDao pointLinkDao = new PointLinkDao();
 
         vo.validate(response);
 
@@ -179,4 +172,18 @@ else if (pvt.getTime() == -1)
         response.addMessage("script", message);
         return response;
     }
+
+    public DwrResponseI18n getPointLinkResponse(int id) {
+        PointLinkVO vo = getPointLink(id);
+        DwrResponseI18n response = new DwrResponseI18n();
+        response.addData("pointLink", vo);
+
+        DataPointService dataPointService = new DataPointService();
+        User user = Common.getUser();
+        Set<DataPointBean> sourcePoints = getSourceDataPointsByPointLinks(user, Collections.singletonList(vo), dataPointService);
+        Set<DataPointBean> targetPoints = getTargetDataPointsByPointLinks(user, Collections.singletonList(vo), dataPointService);
+        response.addData("sourcePoints", sourcePoints);
+        response.addData("targetPoints", targetPoints);
+        return response;
+    }
 }
diff --git a/src/com/serotonin/mango/web/dwr/PublisherEditDwr.java b/src/com/serotonin/mango/web/dwr/PublisherEditDwr.java
index 57653dfae4..16d50c5995 100644
--- a/src/com/serotonin/mango/web/dwr/PublisherEditDwr.java
+++ b/src/com/serotonin/mango/web/dwr/PublisherEditDwr.java
@@ -19,18 +19,11 @@
 package com.serotonin.mango.web.dwr;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 import com.serotonin.db.KeyValuePair;
 import com.serotonin.mango.Common;
-import com.serotonin.mango.DataTypes;
-import com.serotonin.mango.db.dao.DataPointDao;
 import com.serotonin.mango.rt.publish.persistent.PersistentSenderRT;
-import com.serotonin.mango.vo.DataPointExtendedNameComparator;
-import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.permission.Permissions;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.publish.PublishedPointVO;
@@ -47,6 +40,8 @@
 import com.serotonin.web.i18n.LocalizableMessage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.utils.GetDataPointsUtils;
 
 /**
  * @author Matthew Lohbihler
@@ -73,19 +68,13 @@ public void cancelTestingUtility() {
     }
 
     public DwrResponseI18n initSender() {
-        List<DataPointVO> allPoints = new DataPointDao().getDataPoints(DataPointExtendedNameComparator.instance, false);
-
-        // Remove image points
-        Iterator<DataPointVO> iter = allPoints.iterator();
-        while (iter.hasNext()) {
-            DataPointVO dp = iter.next();
-            if (dp.getPointLocator().getDataTypeId() == DataTypes.IMAGE)
-                iter.remove();
-        }
+        User user = Common.getUser();
 
         DwrResponseI18n response = new DwrResponseI18n();
-        response.addData("publisher", Common.getUser().getEditPublisher());
-        response.addData("allPoints", allPoints);
+        PublisherVO<?> publisher = Common.getUser().getEditPublisher();
+        DataPointService dataPointService = new DataPointService();
+        response.addData("publisher", publisher);
+        response.addData("selectedPoints", GetDataPointsUtils.getDataPointsByPublishers(user, Arrays.asList(publisher), dataPointService));
         return response;
     }
 
@@ -127,7 +116,9 @@ public DwrResponseI18n saveHttpSender(String name, String xid, boolean enabled,
         setAuthorizationStaticHeader(p, username, password);
         setContentTypeJsonStaticHeader(p, useJSON);
 
-        return trySave(p);
+        DwrResponseI18n response = trySave(p);
+        response.getData().putAll(initSender().getData());
+        return response;
     }
 
     public void httpSenderTest() {
@@ -245,7 +236,10 @@ public DwrResponseI18n savePachubeSender(String name, String xid, boolean enable
         p.setSnapshotSendPeriods(snapshotSendPeriods);
         p.setSnapshotSendPeriodType(snapshotSendPeriodType);
 
-        return trySave(p);
+        DwrResponseI18n response = trySave(p);
+        response.getData().putAll(initSender().getData());
+
+        return response;
     }
 
     //
@@ -274,7 +268,10 @@ public DwrResponseI18n savePersistentSender(String name, String xid, boolean ena
         p.setSnapshotSendPeriods(snapshotSendPeriods);
         p.setSnapshotSendPeriodType(snapshotSendPeriodType);
 
-        return trySave(p);
+        DwrResponseI18n response = trySave(p);
+        response.getData().putAll(initSender().getData());
+
+        return response;
     }
 
     public DwrResponseI18n getPersistentSenderStatus() {
diff --git a/src/com/serotonin/mango/web/dwr/ReportsDwr.java b/src/com/serotonin/mango/web/dwr/ReportsDwr.java
index 9c3ebc383a..bf06bd5918 100644
--- a/src/com/serotonin/mango/web/dwr/ReportsDwr.java
+++ b/src/com/serotonin/mango/web/dwr/ReportsDwr.java
@@ -38,9 +38,9 @@
 import org.scada_lts.permissions.service.GetReportInstancesWithAccess;
 import org.scada_lts.permissions.service.GetReportsWithAccess;
 import org.scada_lts.web.mvc.api.dto.MailingListJson;
+import org.scada_lts.utils.GetDataPointsUtils;
 
-import java.util.List;
-import java.util.ResourceBundle;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -52,7 +52,7 @@ public DwrResponseI18n init() {
         MangoReport reportService = new ReportService();
         User user = Common.getUser();
 
-        response.addData("points", getReadablePoints());
+
         MailingListService mailingListService = new MailingListService();
         List<MailingList> mailingListFromDatabase = mailingListService.getMailingLists();
         List<MailingListJson> mailingLists = mailingListFromDatabase.stream()
@@ -72,11 +72,13 @@ public DwrResponseI18n init() {
 
     public ReportVO getReport(int id, boolean copy) {
         ReportVO report;
+        User user = Common.getUser();
         if (id == Common.NEW_ID) {
             report = new ReportVO();
             report.setName(getMessage("common.newName"));
-        }
-        else {
+            report.setUserId(user.getId());
+            report.setUsername(user.getUsername());
+        } else {
             report = new ReportService().getReport(id);
 
             if (copy) {
@@ -84,7 +86,7 @@ public ReportVO getReport(int id, boolean copy) {
                 report.setName(LocalizableMessage.getMessage(getResourceBundle(), "common.copyPrefix", report.getName()));
             }
 
-            Permissions.ensureReportPermission(Common.getUser(), report);
+            Permissions.ensureReportPermission(user, report);
         }
         return report;
     }
@@ -269,6 +271,30 @@ public ReportVO createReportFromWatchlist(int watchListId) {
             report.getPoints().add(rp);
         }
 
+        User user = Common.getUser();
+        report.setUserId(user.getId());
+        report.setUsername(user.getUsername());
         return report;
     }
+
+    public DwrResponseI18n createReportFromWatchlistResponse(int watchListId) {
+        ReportVO report = createReportFromWatchlist(watchListId);
+        return getReportResponse(report);
+    }
+
+    public DwrResponseI18n getReportResponse(int id, boolean copy) {
+        ReportVO report = getReport(id, copy);
+        return getReportResponse(report);
+    }
+
+    private static DwrResponseI18n getReportResponse(ReportVO report) {
+        User user = Common.getUser();
+        Permissions.ensureReportPermission(user, report);
+        DataPointService dataPointService = new DataPointService();
+
+        DwrResponseI18n response = new DwrResponseI18n();
+        response.addData("report", report);
+        response.addData("points", GetDataPointsUtils.getDataPointsByReport(user, report, dataPointService));
+        return response;
+    }
 }
diff --git a/src/com/serotonin/mango/web/dwr/UsersDwr.java b/src/com/serotonin/mango/web/dwr/UsersDwr.java
index 8bde7181ab..2260b8a22f 100644
--- a/src/com/serotonin/mango/web/dwr/UsersDwr.java
+++ b/src/com/serotonin/mango/web/dwr/UsersDwr.java
@@ -267,7 +267,7 @@ public DwrResponseI18n saveUser(int id, String firstName, String lastName,
 		if (!response.getHasMessages()) {
 			userDao.saveUser(updateUser);
 			userDao.updateUserScadaTheme(updateUser);
-			Common.updateUserInSession(request, updateUser);
+			ApplicationBeans.getLoggedUsersBean().updateUser(updateUser);
 		}
 
 		return response;
diff --git a/src/com/serotonin/mango/web/dwr/ViewDwr.java b/src/com/serotonin/mango/web/dwr/ViewDwr.java
index 92b635b2fc..c5d26e0372 100644
--- a/src/com/serotonin/mango/web/dwr/ViewDwr.java
+++ b/src/com/serotonin/mango/web/dwr/ViewDwr.java
@@ -76,7 +76,6 @@
 import com.serotonin.mango.view.component.ThumbnailComponent;
 import com.serotonin.mango.view.component.ViewComponent;
 import com.serotonin.mango.view.text.TextRenderer;
-import com.serotonin.mango.vo.DataPointExtendedNameComparator;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.permission.PermissionException;
@@ -97,6 +96,7 @@
 import org.scada_lts.permissions.service.GetDataPointsWithAccess;
 import org.scada_lts.permissions.service.GetObjectsWithAccess;
 import org.scada_lts.permissions.service.GetViewsWithAccess;
+import org.scada_lts.utils.GetDataPointsUtils;
 import org.scada_lts.web.beans.ApplicationBeans;
 
 import static com.serotonin.mango.util.ViewControllerUtils.copyAndSaveView;
@@ -403,13 +403,8 @@ public Map<String, Object> editInit(int viewId) {
 		result.put("componentTypes", components);
 
 		// Available points
-		List<DataPointVO> allPoints = new DataPointDao().getDataPoints(DataPointExtendedNameComparator.instance, false);
-		List<DataPointBean> availablePoints = new ArrayList<DataPointBean>();
-		for (DataPointVO dataPoint : allPoints) {
-			if (Permissions.hasDataPointReadPermission(user, dataPoint))
-				availablePoints.add(new DataPointBean(dataPoint));
-		}
-		result.put("pointList", availablePoints);
+		DataPointService dataPointService = new DataPointService();
+		result.put("pointList", GetDataPointsUtils.getDataPointsByView(user, view, dataPointService));
 
 		return result;
 	}
@@ -417,8 +412,6 @@ public Map<String, Object> editInit(int viewId) {
 	
 	public ViewComponent addComponent(String componentName, int viewId) {
 		ViewComponent viewComponent = ViewComponent.newInstance(componentName);
-		// System.out.println(componentName);
-		// System.out.println(viewComponent);
 
 		User user = Common.getUser();
 		View view = getView(viewId, WebContextFactory.get().getHttpServletRequest(), new ViewService(), true);
@@ -476,6 +469,8 @@ public DwrResponseI18n setPointComponentSettings(String pointComponentId, int da
 			pc.validateDataPoint(user, false);
 		}
 
+		response.addData("pointList", getPointList(viewId, pc, user));
+		response.addData("comp", pc);
 		return response;
 	}
 
@@ -562,7 +557,7 @@ public DwrResponseI18n saveScriptButtonComponent(String viewComponentId, String
 	
 	public DwrResponseI18n saveAnalogGraphicComponent(String viewComponentId, double min, double max, boolean displayText, String imageSetId, int viewId) {
 		DwrResponseI18n response = new DwrResponseI18n();
-
+		User user = Common.getUser();
 		// Validate
 		if (min >= max)
 			response.addContextualMessage("graphicRendererAnalogMin", "viewEdit.graphic.invalidMinMax");
@@ -578,15 +573,18 @@ public DwrResponseI18n saveAnalogGraphicComponent(String viewComponentId, double
 			c.setDisplayText(displayText);
 			c.tsetImageSet(imageSet);
 			resetPointComponent(c);
+			response.addData("pointList", getPointList(viewId, c, user));
+		} else {
+			ViewComponent viewComponent = getViewComponent(viewComponentId, viewId);
+			response.addData("pointList", getPointList(viewId, viewComponent, user));
 		}
-
 		return response;
 	}
 
 	
 	public DwrResponseI18n saveBinaryGraphicComponent(String viewComponentId, int zeroImage, int oneImage, boolean displayText, String imageSetId, int viewId) {
 		DwrResponseI18n response = new DwrResponseI18n();
-
+		User user = Common.getUser();
 		// Validate
 		ImageSet imageSet = getImageSet(imageSetId);
 		if (imageSet == null || !imageSet.isAvailable())
@@ -605,15 +603,18 @@ public DwrResponseI18n saveBinaryGraphicComponent(String viewComponentId, int ze
 			c.setOneImage(oneImage);
 			c.setDisplayText(displayText);
 			resetPointComponent(c);
+			response.addData("pointList", getPointList(viewId, c, user));
+		} else {
+			ViewComponent viewComponent = getViewComponent(viewComponentId, viewId);
+			response.addData("pointList", getPointList(viewId, viewComponent, user));
 		}
-
 		return response;
 	}
 
 	
 	public DwrResponseI18n saveDynamicGraphicComponent(String viewComponentId, double min, double max, boolean displayText, String dynamicImageId, int viewId) {
 		DwrResponseI18n response = new DwrResponseI18n();
-
+		User user = Common.getUser();
 		// Validate
 		if (min >= max)
 			response.addContextualMessage("graphicRendererDynamicMin", "viewEdit.graphic.invalidMinMax");
@@ -629,14 +630,18 @@ public DwrResponseI18n saveDynamicGraphicComponent(String viewComponentId, doubl
 			c.setDisplayText(displayText);
 			c.tsetDynamicImage(dynamicImage);
 			resetPointComponent(c);
+			response.addData("pointList", getPointList(viewId, c, user));
+		} else {
+			ViewComponent viewComponent = getViewComponent(viewComponentId, viewId);
+			response.addData("pointList", getPointList(viewId, viewComponent, user));
 		}
-
 		return response;
 	}
 
 	
 	public DwrResponseI18n saveMultistateGraphicComponent(String viewComponentId, List<IntValuePair> imageStates, int defaultImage, boolean displayText, String imageSetId, int viewId) {
 		DwrResponseI18n response = new DwrResponseI18n();
+		User user = Common.getUser();
 
 		// Validate
 		ImageSet imageSet = getImageSet(imageSetId);
@@ -650,8 +655,12 @@ public DwrResponseI18n saveMultistateGraphicComponent(String viewComponentId, Li
 			c.setDisplayText(displayText);
 			c.tsetImageSet(imageSet);
 			resetPointComponent(c);
-		}
+			response.addData("pointList", getPointList(viewId, c, user));
 
+		} else {
+			ViewComponent viewComponent = getViewComponent(viewComponentId, viewId);
+			response.addData("pointList", getPointList(viewId, viewComponent, user));
+		}
 		return response;
 	}
 
@@ -678,7 +687,11 @@ public DwrResponseI18n saveSimplePointComponent(String viewComponentId, boolean
 		c.setStyleAttribute(styleAttribute);
 		resetPointComponent(c);
 
-		return new DwrResponseI18n();
+		DwrResponseI18n response = new DwrResponseI18n();
+
+		User user = Common.getUser();
+		response.addData("pointList", getPointList(viewId, c, user));
+		return response;
 	}
 
 	
@@ -721,8 +734,12 @@ public DwrResponseI18n saveSimpleCompoundComponent(String viewComponentId, Strin
 			c.setBackgroundColour(backgroundColour);
 			c.setLocation(positionX, positionY);
 			saveCompoundPoints(c, childPointIds);
+			response.addData("comp", c);
+		} else {
+			ViewComponent viewComponent = getViewComponent(viewComponentId, viewId);
+			response.addData("comp", viewComponent);
 		}
-
+		response.addData("pointList", getPointListByChildren(childPointIds));
 		return response;
 	}
 
@@ -732,8 +749,9 @@ public DwrResponseI18n saveImageChartComponent(String viewComponentId, String na
 
 		commonImageChartComponentValidation(name, width, height, durationType, durationPeriods, response);
 
+		ImageChartComponent c = null;
 		if (!response.getHasMessages()) {
-			ImageChartComponent c = (ImageChartComponent) getViewComponent(viewComponentId, viewId);
+			c = (ImageChartComponent) getViewComponent(viewComponentId, viewId);
 			c.setName(name);
 			c.setWidth(width);
 			c.setHeight(height);
@@ -741,8 +759,10 @@ public DwrResponseI18n saveImageChartComponent(String viewComponentId, String na
 			c.setDurationPeriods(durationPeriods);
 			c.setLocation(positionX, positionY);
 			saveCompoundPoints(c, childPointIds);
+
 		}
 
+		response.addData("pointList", getPointListByChildren(childPointIds));
 		return response;
 	}
 
@@ -767,6 +787,8 @@ public DwrResponseI18n saveEnhancedImageChartComponent(String viewComponentId, S
 			c.setLocation(positionX, positionY);
 		}
 
+		response.addData("pointList", getPointListByChildren(childPointIds));
+
 		return response;
 	}
 
@@ -781,8 +803,13 @@ public DwrResponseI18n saveCompoundComponent(String viewComponentId, String name
 			c.setName(name);
 			c.setLocation(positionX, positionY);
 			saveCompoundPoints(c, childPointIds);
+			response.addData("comp", c);
+		} else {
+			ViewComponent viewComponent = getViewComponent(viewComponentId, viewId);
+			response.addData("comp", viewComponent);
 		}
 
+		response.addData("pointList", getPointListByChildren(childPointIds));
 		return response;
 	}
 
@@ -1108,4 +1135,34 @@ public DwrResponseI18n copyView(final int viewId){
 		return response;
 	}
 
+	public DwrResponseI18n getViewComponentResponse(String viewComponentId, int viewId) {
+		View view = getView(viewId, WebContextFactory.get().getHttpServletRequest(), new ViewService(), true);
+		DwrResponseI18n response = new DwrResponseI18n();
+		User user = Common.getUser();
+		ViewComponent viewComponent = getViewComponent(view, viewComponentId);
+		Set<DataPointBean> availablePoints = getPointList(viewId, viewComponent, user);
+		response.addData("pointList", availablePoints);
+		response.addData("comp", viewComponent);
+		return response;
+	}
+
+	private static Set<DataPointBean> getPointList(int viewId, ViewComponent viewComponent, User user) {
+		View view = getView(viewId, WebContextFactory.get().getHttpServletRequest(), new ViewService(), true);
+		GetViewsWithAccess.ensureViewOwnerPermission(user, view);
+		DataPointService dataPointService = new DataPointService();
+		return GetDataPointsUtils.getDataPointsByView(user, view, dataPointService).stream()
+				.filter(point -> isSupportType(point, viewComponent))
+				.collect(Collectors.toSet());
+	}
+
+	private static Set<DataPointBean> getPointListByChildren(List<KeyValuePair> childPointIds) {
+		DataPointService dataPointService = new DataPointService();
+		User user = Common.getUser();
+		return GetDataPointsUtils.getDataPointsByChildren(user, childPointIds, dataPointService);
+	}
+
+	private static boolean isSupportType(DataPointBean dataPointBean, ViewComponent viewComponent) {
+		return viewComponent.definition().getSupportedDataTypes() == null || viewComponent.definition().supports(dataPointBean.getDataType());
+	}
+
 }
diff --git a/src/com/serotonin/mango/web/dwr/WatchListDwr.java b/src/com/serotonin/mango/web/dwr/WatchListDwr.java
index fdad94b5c7..bb9042a7ce 100644
--- a/src/com/serotonin/mango/web/dwr/WatchListDwr.java
+++ b/src/com/serotonin/mango/web/dwr/WatchListDwr.java
@@ -45,6 +45,7 @@
 import com.serotonin.util.ArrayUtils;
 import com.serotonin.util.ObjectUtils;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.scada_lts.mango.service.DataPointService;
 
 public class WatchListDwr extends BaseDwr {
 	public Map<String, Object> init() {
@@ -53,12 +54,12 @@ public Map<String, Object> init() {
 
 		PointHierarchy ph = dataPointDao.getPointHierarchy().copyFoldersOnly();
 		User user = Common.getUser();
-		List<DataPointVO> points = dataPointDao.getDataPoints(
-				DataPointExtendedNameComparator.instance, false);
+		DataPointService dataPointService = new DataPointService();
+		List<DataPointVO> points = dataPointService.getDataPointsWithAccess(user);
+
 		for (DataPointVO point : points) {
-			if (Permissions.hasDataPointReadPermission(user, point))
-				ph.addDataPoint(point.getId(), point.getPointFolderId(),
-						point.getExtendedName());
+			ph.addDataPoint(point.getId(), point.getPointFolderId(),
+					point.getExtendedName());
 		}
 
 		ph.parseEmptyFolders();
diff --git a/src/com/serotonin/mango/web/dwr/beans/DataPointBean.java b/src/com/serotonin/mango/web/dwr/beans/DataPointBean.java
index 4a58a4f057..7b603c8411 100644
--- a/src/com/serotonin/mango/web/dwr/beans/DataPointBean.java
+++ b/src/com/serotonin/mango/web/dwr/beans/DataPointBean.java
@@ -21,6 +21,8 @@
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import java.util.Objects;
+
 public class DataPointBean {
     private int id;
     private String xid;
@@ -29,6 +31,7 @@ public class DataPointBean {
     private int dataType;
     private final LocalizableMessage dataTypeMessage;
     private final String chartColour;
+    private final boolean enabled;
 
     public DataPointBean(DataPointVO vo) {
         id = vo.getId();
@@ -38,6 +41,7 @@ public DataPointBean(DataPointVO vo) {
         dataTypeMessage = vo.getDataTypeMessage();
         chartColour = vo.getChartColour();
         xid = vo.getXid();
+        enabled = vo.isEnabled();
     }
 
     public int getId() {
@@ -87,4 +91,21 @@ public String getXid() {
     public void setXid(String xid) {
         this.xid = xid;
     }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DataPointBean that = (DataPointBean) o;
+        return id == that.id;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }
diff --git a/src/com/serotonin/mango/web/dwr/beans/ViewComponentState.java b/src/com/serotonin/mango/web/dwr/beans/ViewComponentState.java
index 083fe6ce15..51f3ff1034 100644
--- a/src/com/serotonin/mango/web/dwr/beans/ViewComponentState.java
+++ b/src/com/serotonin/mango/web/dwr/beans/ViewComponentState.java
@@ -73,7 +73,7 @@ public void removeEqualValue(ViewComponentState that) {
 
 	@Override
 	public boolean isEmpty() {
-		return content == null && info == null && super.isEmpty();
+		return content == null && info == null && data == null && super.isEmpty();
 	}
 
 	public boolean isGraph() {
diff --git a/src/com/serotonin/mango/web/mvc/controller/ControllerUtils.java b/src/com/serotonin/mango/web/mvc/controller/ControllerUtils.java
index 81ba42db0f..15b77040a8 100644
--- a/src/com/serotonin/mango/web/mvc/controller/ControllerUtils.java
+++ b/src/com/serotonin/mango/web/mvc/controller/ControllerUtils.java
@@ -18,13 +18,18 @@
  */
 package com.serotonin.mango.web.mvc.controller;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
 
+import com.serotonin.db.IntValuePair;
+import com.serotonin.mango.DataTypes;
+import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
 import com.serotonin.util.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.permissions.service.GetDataPointsWithAccess;
 import org.springframework.ui.Model;
 
 import com.serotonin.mango.db.dao.DataPointDao;
@@ -42,6 +47,7 @@ public final class ControllerUtils {
 
     private ControllerUtils() {}
 
+    @Deprecated(since = "2.8.1")
     public static void addPointListDataToModel(User user, int pointId, Map<String, Object> model) {
         List<DataPointVO> allPoints = new DataPointDao().getDataPoints(DataPointExtendedNameComparator.instance, false);
         List<DataPointVO> userPoints = new LinkedList<DataPointVO>();
@@ -61,7 +67,8 @@ public static void addPointListDataToModel(User user, int pointId, Map<String, O
         if (pointIndex < userPoints.size() - 1)
             model.put("nextId", userPoints.get(pointIndex + 1).getId());
     }
-    
+
+    @Deprecated(since = "2.8.1")
     public static void addPointListDataToModel(User user, int pointId, Model model){
         List<DataPointVO> allPoints = new DataPointDao().getDataPoints(DataPointExtendedNameComparator.instance, false);
         List<DataPointVO> userPoints = new LinkedList<DataPointVO>();
@@ -82,10 +89,92 @@ public static void addPointListDataToModel(User user, int pointId, Model model){
             model.addAttribute("nextId", userPoints.get(pointIndex + 1).getId());
     }
 
+    public static void addPointListDataToModel(BiConsumer<String, Object> model, User user, DataPointVO point) {
+
+        if(point == null) {
+            acceptModel(model, Collections.emptyList(), -1, -1);
+            return;
+        }
+
+        DataPointService dataPointService = new DataPointService();
+
+        int prevId = dataPointService.getDataPointIdWithAccessPrev(user, point.getExtendedName());
+        int nextId = dataPointService.getDataPointIdWithAccessNext(user, point.getExtendedName());
+        List<DataPointVO> userPoints = new ArrayList<>();
+        if (GetDataPointsWithAccess.hasDataPointReadPermission(user, point))
+            userPoints.add(point);
+
+        acceptModel(model, userPoints, prevId, nextId);
+    }
+
     public static String getHomeUrl(User user) {
         if(StringUtils.isEmpty(user.getHomeUrl())) {
             return "/watch_list.shtm";
         }
         return user.getHomeUrl().startsWith("/") ? user.getHomeUrl() : "/" + user.getHomeUrl();
     }
+
+    public static List<DataPointVO> getUserPoints(User user, List<DataPointVO> allPoints, Comparator<DataPointVO> comparator) {
+
+        List<DataPointVO> userPoints = new ArrayList<>();
+        for (DataPointVO dp : allPoints) {
+            addPointIfHasPermission(dp, user, userPoints);
+        }
+        if(comparator != null) {
+            userPoints.sort(comparator);
+        }
+        return userPoints;
+    }
+
+    public static List<DataPointVO> getContextPoints(User user, List<DataPointVO> allPoints,
+                                                     DataPointService dataPointService,
+                                                     Comparator<DataPointVO> comparator) {
+
+        List<DataPointVO> contextPoints = new ArrayList<>();
+        for (DataPointVO dp : allPoints) {
+            if(dp.getPointLocator() instanceof MetaPointLocatorVO) {
+                MetaPointLocatorVO pointLocatorVO = dp.getPointLocator();
+                Set<Integer> ids = pointLocatorVO.getContext().stream().map(IntValuePair::getKey).collect(Collectors.toSet());
+                List<DataPointVO> dataPoints = dataPointService.getDataPoints(ids);
+                for(DataPointVO dataPoint: dataPoints) {
+                    addPointIfHasPermission(dataPoint, user, contextPoints);
+                }
+            }
+        }
+        if(comparator != null) {
+            contextPoints.sort(comparator);
+        }
+        return contextPoints;
+    }
+
+    public static List<DataPointVO> getAnalogPoints(User user, List<DataPointVO> allPoints,
+                                                    Comparator<DataPointVO> comparator) {
+        List<DataPointVO> analogPoints = new ArrayList<>();
+        for (DataPointVO dp : allPoints) {
+            if (dp.getPointLocator().getDataTypeId() == DataTypes.NUMERIC) {
+                addPointIfHasPermission(dp, user, analogPoints);
+            }
+        }
+        if(comparator != null) {
+            analogPoints.sort(comparator);
+        }
+        return analogPoints;
+    }
+
+    private static void addPointIfHasPermission(DataPointVO dp, User user, List<DataPointVO> userPoints) {
+        if (GetDataPointsWithAccess.hasDataPointReadPermission(user, dp)) {
+            userPoints.add(dp);
+        }
+    }
+
+    private static void acceptModel(BiConsumer<String, Object> model, List<DataPointVO> userPoints, int prevId, int nextId) {
+
+        model.accept("userPoints", userPoints);
+
+        // Determine next and previous ids
+        if (prevId > 0)
+            model.accept("prevId", prevId);
+        if (nextId > 0)
+            model.accept("nextId", nextId);
+    }
 }
diff --git a/src/com/serotonin/mango/web/mvc/controller/DataPointDetailsController.java b/src/com/serotonin/mango/web/mvc/controller/DataPointDetailsController.java
index 429a40cd9e..58dda8d111 100644
--- a/src/com/serotonin/mango/web/mvc/controller/DataPointDetailsController.java
+++ b/src/com/serotonin/mango/web/mvc/controller/DataPointDetailsController.java
@@ -29,14 +29,14 @@
 import org.scada_lts.dao.model.UserIdentifier;
 import org.scada_lts.mango.adapter.MangoEvent;
 import org.scada_lts.mango.service.EventService;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.mango.service.UserService;
 import org.scada_lts.mango.service.ViewService;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.ParameterizableViewController;
 
 import com.serotonin.ShouldNeverHappenException;
 import com.serotonin.mango.Common;
-import com.serotonin.mango.db.dao.DataPointDao;
-import com.serotonin.mango.db.dao.UserDao;
 import com.serotonin.mango.view.View;
 import com.serotonin.mango.view.chart.ImageChartRenderer;
 import com.serotonin.mango.view.chart.ImageFlipbookRenderer;
@@ -54,7 +54,7 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request,
 		User user = Common.getUser(request);
 
 		int id;
-		DataPointDao dataPointDao = new DataPointDao();
+		DataPointService dataPointDao = new DataPointService();
 		String idStr = request.getParameter("dpid");
 		DataPointVO point = null;
 
@@ -99,7 +99,7 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request,
 			model.put("views", views);
 
 			// Get the users that have access to this point.
-			List<User> allUsers = new UserDao().getUsers();
+			List<User> allUsers = new UserService().getUsers();
 			List<Map<String, Object>> users = new LinkedList<Map<String, Object>>();
 			Map<String, Object> userData;
 			int accessType;
@@ -162,7 +162,7 @@ else if (point.getChartRenderer() instanceof ImageFlipbookRenderer)
 		user.setEditPoint(point);
 
 		// Find accessible points for the goto list
-		ControllerUtils.addPointListDataToModel(user, id, model);
+		ControllerUtils.addPointListDataToModel(model::put, user, point);
 
 		return new ModelAndView(getViewName(), model);
 	}
diff --git a/src/com/serotonin/mango/web/mvc/controller/DataSourceEditController.java b/src/com/serotonin/mango/web/mvc/controller/DataSourceEditController.java
index 5926f79150..ae1790c00e 100644
--- a/src/com/serotonin/mango/web/mvc/controller/DataSourceEditController.java
+++ b/src/com/serotonin/mango/web/mvc/controller/DataSourceEditController.java
@@ -18,24 +18,20 @@
  */
 package com.serotonin.mango.web.mvc.controller;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.serotonin.mango.util.SqlDataSourceUtils;
 import com.serotonin.mango.vo.CommPortProxy;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.mango.service.DataSourceService;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.ParameterizableViewController;
 
 import com.serotonin.ShouldNeverHappenException;
 import com.serotonin.mango.Common;
-import com.serotonin.mango.DataTypes;
-import com.serotonin.mango.db.dao.DataPointDao;
-import com.serotonin.mango.db.dao.DataSourceDao;
 import com.serotonin.mango.util.CommPortConfigException;
 import com.serotonin.mango.vo.DataPointExtendedNameComparator;
 import com.serotonin.mango.vo.DataPointVO;
@@ -43,6 +39,8 @@
 import com.serotonin.mango.vo.dataSource.DataSourceVO;
 import com.serotonin.mango.vo.permission.Permissions;
 
+import static com.serotonin.mango.web.mvc.controller.ControllerUtils.*;
+
 public class DataSourceEditController extends ParameterizableViewController {
     @Override
     protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response)
@@ -51,24 +49,19 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
         User user = Common.getUser(request);
         Permissions.ensureAdmin(user);
 
+        DataPointService dataPointService = new DataPointService();
+        DataSourceService dataSourceService = new DataSourceService();
+
         // Get the id.
         int id = Common.NEW_ID;
         String idStr = request.getParameter("dsid");
+        DataPointVO dp = null;
         if (idStr == null) {
             // Check for a data point id
             String pidStr = request.getParameter("pid");
-            if (pidStr == null) {
-                // Adding a new data source? Get the type id.
-                int typeId = Integer.parseInt(request.getParameter("typeId"));
-
-                // A new data source
-                dataSourceVO = DataSourceVO.createDataSourceVO(typeId);
-                dataSourceVO.setId(Common.NEW_ID);
-                dataSourceVO.setXid(new DataSourceDao().generateUniqueXid());
-            }
-            else {
+            if (pidStr != null) {
                 int pid = Integer.parseInt(pidStr);
-                DataPointVO dp = new DataPointDao().getDataPoint(pid);
+                dp = dataPointService.getDataPoint(pid);
                 if (dp == null)
                     throw new ShouldNeverHappenException("DataPoint not found with id " + pid);
                 id = dp.getDataSourceId();
@@ -82,6 +75,14 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
             dataSourceVO = Common.ctx.getRuntimeManager().getDataSource(id);
             if (dataSourceVO == null)
                 throw new ShouldNeverHappenException("DataSource not found with id " + id);
+        } else {
+            // Adding a new data source? Get the type id.
+            int typeId = Integer.parseInt(request.getParameter("typeId"));
+
+            // A new data source
+            dataSourceVO = DataSourceVO.createDataSourceVO(typeId);
+            dataSourceVO.setId(Common.NEW_ID);
+            dataSourceVO.setXid(dataSourceService.generateUniqueXid());
         }
 
         // Set the id of the data source in the user object for the DWR.
@@ -101,17 +102,17 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
             model.put("commPortError", e.getMessage());
         }
 
-        List<DataPointVO> allPoints = new DataPointDao().getDataPoints(DataPointExtendedNameComparator.instance, false);
-        List<DataPointVO> userPoints = new LinkedList<DataPointVO>();
-        List<DataPointVO> analogPoints = new LinkedList<DataPointVO>();
-        for (DataPointVO dp : allPoints) {
-            if (Permissions.hasDataPointReadPermission(user, dp)) {
-                userPoints.add(dp);
-                if (dp.getPointLocator().getDataTypeId() == DataTypes.NUMERIC)
-                    analogPoints.add(dp);
-            }
-        }
+        List<DataPointVO> allPoints = dataPointService.getDataPoints(dataSourceVO.getId(), null);
+
+        List<DataPointVO> userPoints = getUserPoints(user, allPoints, DataPointExtendedNameComparator.instance);
+        List<DataPointVO> contextPoints = getContextPoints(user, dp == null ? allPoints : Arrays.asList(dp), dataPointService, DataPointExtendedNameComparator.instance);
+        List<DataPointVO> points = new ArrayList<>();
+        points.addAll(userPoints);
+        points.addAll(contextPoints);
+        List<DataPointVO> analogPoints = getAnalogPoints(user, points, DataPointExtendedNameComparator.instance);
+
         model.put("userPoints", userPoints);
+        model.put("contextPoints", contextPoints);
         model.put("analogPoints", analogPoints);
         model.put("selectWithLimitLowerCaseRegex", SqlDataSourceUtils.selectWithLimitLowerCaseEscape());
         return new ModelAndView(getViewName(), model);
diff --git a/src/com/serotonin/mango/web/mvc/controller/ScadaLocaleUtils.java b/src/com/serotonin/mango/web/mvc/controller/ScadaLocaleUtils.java
index b6b9392bea..f513c62672 100644
--- a/src/com/serotonin/mango/web/mvc/controller/ScadaLocaleUtils.java
+++ b/src/com/serotonin/mango/web/mvc/controller/ScadaLocaleUtils.java
@@ -12,6 +12,9 @@
 import org.scada_lts.dao.SystemSettingsDAO;
 import org.springframework.beans.propertyeditors.LocaleEditor;
 import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.support.RequestContextUtils;
@@ -165,9 +168,17 @@ private static Locale getLocale(HttpServletRequest request, boolean localeIsSetI
 
     private static HttpServletRequest getRequestFromWebContext() {
         WebContext webContext = WebContextFactory.get();
-        if(webContext != null)
-            return webContext.getHttpServletRequest();
-        return null;
+        HttpServletRequest httpServletRequest = null;
+        if(webContext != null) {
+            httpServletRequest = webContext.getHttpServletRequest();
+        }
+        if(httpServletRequest == null) {
+            RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+            if (requestAttributes instanceof ServletRequestAttributes) {
+                httpServletRequest = ((ServletRequestAttributes) requestAttributes).getRequest();
+            }
+        }
+        return httpServletRequest;
     }
 
     public static List<Locale> getLocales() {
diff --git a/src/com/serotonin/mango/web/servlet/ImageChartServlet.java b/src/com/serotonin/mango/web/servlet/ImageChartServlet.java
index 1a9c39475e..1599af5f49 100644
--- a/src/com/serotonin/mango/web/servlet/ImageChartServlet.java
+++ b/src/com/serotonin/mango/web/servlet/ImageChartServlet.java
@@ -42,6 +42,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static org.scada_lts.utils.GetDataPointValuesUtils.getDataPointValues;
+
 public class ImageChartServlet extends BaseInfoServlet {
     private static final long serialVersionUID = -1;
     private static final long CACHE_PURGE_INTERVAL = 1000 * 60 * 10; // 10 minutes
@@ -139,16 +141,7 @@ else if (imageBits[i].startsWith("h"))
                     }
 
                     // Get the data.
-                    PointValueFacade pointValueFacade = new PointValueFacade(dataPointId);
-                    List<PointValueTime> data;
-                    if (from == -1 && to == -1)
-                        data = pointValueFacade.getPointValues(0);
-                    else if (from == -1)
-                        data = pointValueFacade.getPointValuesBetween(0, to);
-                    else if (to == -1)
-                        data = pointValueFacade.getPointValues(from);
-                    else
-                        data = pointValueFacade.getPointValuesBetween(from, to);
+                    List<PointValueTime> data = getDataPointValues(from, to, dataPointId);
 
                     DataPointVO dp = new DataPointDao().getDataPoint(dataPointId);
                     if (dp == null || dp.getName() == null)
diff --git a/src/org/scada_lts/dao/DataPointDAO.java b/src/org/scada_lts/dao/DataPointDAO.java
index f3bfc03a99..ff878a154b 100644
--- a/src/org/scada_lts/dao/DataPointDAO.java
+++ b/src/org/scada_lts/dao/DataPointDAO.java
@@ -19,9 +19,13 @@
 
 import java.sql.*;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import com.serotonin.mango.view.ShareUser;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.dao.model.ScadaObjectIdentifier;
@@ -161,12 +165,44 @@ public class DataPointDAO {
 	//userProfile
 	private static final String COLUMN_NAME_UP_DATA_SOURCE_ID = "dataSourceId";
 
-	public static final String DATA_POINT_FILTERED_BASE_ON_USER_ID_USERS_PROFILE_ID_ORDER_BY_DP_NAME = ""
+	public static final String ORDER_BY_NAME = ""
+			+ "order by dp." + COLUMN_NAME_DATAPOINT_NAME;
+
+	public static final String DATA_POINT_FILTERED_BASE_ON_USER_ID_USERS_PROFILE_ID = ""
 			+ "dp.id in (select dpu." + COLUMN_NAME_DPU_DATA_POINT_ID + " from dataPointUsers dpu where dpu." + COLUMN_NAME_DPU_USER_ID + "=? and dpu." + COLUMN_NAME_DPU_ACCESS_TYPE +">?) or "
 			+ "dp.id in (select dpup." + COLUMN_NAME_UP_DATA_POINT_ID+" from dataPointUsersProfiles dpup where dpup." +COLUMN_NAME_UP_USER_PRFILE_ID + "=? and dpup."+COLUMN_NAME_UP_PERMISSION+">?) or "
 			+ "dp.dataSourceId in (select dsu." + COLUMN_NAME_DSU_DATA_SOURCE_ID + " from dataSourceUsers dsu where dsu." + COLUMN_NAME_DSU_USER_ID + "=?) or "
-			+ "dp.dataSourceId in (select dsup." + COLUMN_NAME_UP_DATA_SOURCE_ID + " from dataSourceUsersProfiles dsup where dsup." + COLUMN_NAME_UP_USER_PRFILE_ID + "=?) "
-			+ "order by dp." + COLUMN_NAME_DATAPOINT_NAME;
+			+ "dp.dataSourceId in (select dsup." + COLUMN_NAME_UP_DATA_SOURCE_ID + " from dataSourceUsersProfiles dsup where dsup." + COLUMN_NAME_UP_USER_PRFILE_ID + "=?) ";
+
+	public static final String DATA_POINT_FILTERED_BASE_ON_USER_ID_USERS_PROFILE_ID_ORDER_BY_DP_NAME = ""
+			+ DATA_POINT_FILTERED_BASE_ON_USER_ID_USERS_PROFILE_ID
+			+ ORDER_BY_NAME;
+
+    private static final String DATA_POINT_SELECT_ONLY_ID = ""
+            + "select "
+            + "dp." + COLUMN_NAME_ID + " "
+            + "from dataPoints dp join dataSources ds on "
+            + "ds." + COLUMN_NAME_DS_ID + "="
+            + "dp." + COLUMN_NAME_DATA_SOURCE_ID + " ";
+
+	public static final String DATA_POINT_NEXT = ""
+			+ " CONCAT(CONCAT(ds." + COLUMN_NAME_DS_NAME + ", ' - '), dp." + COLUMN_NAME_DATAPOINT_NAME + ") > ? ORDER BY ds." + COLUMN_NAME_DS_NAME + " ASC, dp." + COLUMN_NAME_DATAPOINT_NAME + " ASC LIMIT 1 ";
+
+	public static final String DATA_POINT_PREV = ""
+			+ " CONCAT(CONCAT(ds." + COLUMN_NAME_DS_NAME + ", ' - '), dp." + COLUMN_NAME_DATAPOINT_NAME + ") < ? ORDER BY ds." + COLUMN_NAME_DS_NAME + " DESC, dp." + COLUMN_NAME_DATAPOINT_NAME + " DESC LIMIT 1 ";
+
+
+	public static final String DATA_POINT_PREV_ON_USER_ID_USERS_PROFILE_ID = ""
+			+ "(" + DATA_POINT_FILTERED_BASE_ON_USER_ID_USERS_PROFILE_ID + ") AND "
+			+ DATA_POINT_PREV;
+
+	public static final String DATA_POINT_NEXT_ON_USER_ID_USERS_PROFILE_ID = ""
+			+ "(" + DATA_POINT_FILTERED_BASE_ON_USER_ID_USERS_PROFILE_ID + ") AND "
+			+ DATA_POINT_NEXT;
+
+	public static final String DATA_POINT_ORDER_BY = " ORDER BY ds." + COLUMN_NAME_DS_NAME + " ASC, dp." + COLUMN_NAME_DATAPOINT_NAME + " ASC, dp." + COLUMN_NAME_ID + " DESC";
+
+
 
 	// @formatter:on
 
@@ -184,7 +220,7 @@ public DataPointVO mapRow(ResultSet resultSet, int rowNum) throws SQLException {
 			dataPoint.setDataSourceXid( resultSet.getString("dsxid"));
 			dataPoint.setDataSourceName(resultSet.getString(COLUMN_NAME_DS_NAME));
 			dataPoint.setDataSourceTypeId(resultSet.getInt(COLUMN_NAME_DS_DATA_SOURCE_TYPE));
-			
+
 			return dataPoint;
 		}
 	}
@@ -277,6 +313,7 @@ public List<DataPointVO> getDataPoints(int dataSourceId) {
 		return dataPointList;
 	}
 
+	@Deprecated(since = "2.8.1")
 	public List<DataPointVO> getDataPointByKeyword(String[] keywords) {
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("getDataPointByKeyword(String search) search:" + keywords.toString());
@@ -508,4 +545,111 @@ public List<DataPointVO> getDataPoints(String dataSourceXid) {
 		String templateSelectWhereXid = DATA_POINT_SELECT + " where ds." + COLUMN_NAME_DS_XID + "=?";
 		return DAO.getInstance().getJdbcTemp().query(templateSelectWhereXid, new Object[] {dataSourceXid}, new DataPointRowMapper());
 	}
+
+	public List<DataPointVO> getDataPointsWithLimit(Set<Integer> excludeIds, int offset, int limit) {
+		StringBuilder templateSelectWhereId = new StringBuilder(DATA_POINT_SELECT + " WHERE 1=1 ");
+		List<String> args = new ArrayList<>();
+		if(excludeIds != null && !excludeIds.isEmpty()) {
+			templateSelectWhereId.append(" AND").append(" dp.")
+					.append(COLUMN_NAME_ID)
+					.append(" NOT IN (")
+					.append("?, ".repeat(excludeIds.size() - 1))
+					.append("?").append(") ");
+
+			args.addAll(excludeIds.stream().map(Object::toString).collect(Collectors.toList()));
+		}
+
+		if(limit > 0) {
+			templateSelectWhereId.append(" LIMIT ").append(limit);
+			if (offset > 0)
+				templateSelectWhereId.append(" OFFSET ").append(offset);
+		}
+		return DAO.getInstance().getJdbcTemp().query(templateSelectWhereId.toString(), new DataPointRowMapper(), args.toArray());
+	}
+
+	public List<DataPointVO> selectDataPoints(Set<Integer> ids) {
+		if(ids.isEmpty()) {
+			return Collections.emptyList();
+		}
+		return DAO.getInstance().getJdbcTemp().query(DATA_POINT_SELECT + " where " + " "
+						+ "dp." + COLUMN_NAME_ID + " in (" + "?,".repeat(ids.size() - 1) + "?) "
+						+ "order by dp." + COLUMN_NAME_DATAPOINT_NAME,
+				ids.toArray(),
+				new DataPointRowMapper());
+	}
+
+	public List<DataPointVO> getDataPointByKeywords(Set<String> keywords, Set<Integer> excludeIds, boolean startsWith, int offset, int limit) {
+		StringBuilder templateSelectWhereSearch = new StringBuilder(DATA_POINT_SELECT + " WHERE 1=1 ");
+		List<String> args = new ArrayList<>();
+		for (String keyword : keywords) {
+			if(StringUtils.isEmpty(keyword)) {
+				continue;
+			}
+			templateSelectWhereSearch.append(" AND LOWER(CONCAT(CONCAT(ds.")
+					.append(COLUMN_NAME_DS_NAME)
+					.append(", ' - '), dp.")
+					.append(COLUMN_NAME_DATAPOINT_NAME)
+					.append("))")
+					.append(" LIKE ? ");
+			if(startsWith) {
+				args.add(keyword.toLowerCase() + "%");
+			} else {
+				args.add("%" + keyword.toLowerCase() + "%");
+			}
+		}
+
+		if(excludeIds != null && !excludeIds.isEmpty()) {
+			templateSelectWhereSearch.append(" AND dp.")
+					.append(COLUMN_NAME_ID)
+					.append(" NOT IN (")
+					.append("?, ".repeat(excludeIds.size() - 1))
+					.append("?").append(") ");
+
+			args.addAll(excludeIds.stream().map(Object::toString).collect(Collectors.toList()));
+		}
+		templateSelectWhereSearch.append(DATA_POINT_ORDER_BY);
+
+		if(limit > -1) {
+			templateSelectWhereSearch.append(" LIMIT ").append(limit);
+			if (offset > -1)
+				templateSelectWhereSearch.append(" OFFSET ").append(offset);
+		}
+		return DAO.getInstance().getJdbcTemp().query(templateSelectWhereSearch.toString(), new DataPointRowMapper(), args.toArray());
+	}
+
+    public int selectDataPointIdWithAccessPrev(int userId, int profileId, String name) {
+        try {
+            return DAO.getInstance().getJdbcTemp().queryForObject(DATA_POINT_SELECT_ONLY_ID + " where " + DATA_POINT_PREV_ON_USER_ID_USERS_PROFILE_ID,
+                    new Object[] { userId, ShareUser.ACCESS_NONE, profileId ,ShareUser.ACCESS_NONE, userId, profileId, name }, int.class);
+        } catch (EmptyResultDataAccessException ex) {
+            return -1;
+        }
+    }
+
+    public int selectDataPointIdWithAccessNext(int userId, int profileId, String name) {
+        try {
+            return DAO.getInstance().getJdbcTemp().queryForObject(DATA_POINT_SELECT_ONLY_ID + " where " + DATA_POINT_NEXT_ON_USER_ID_USERS_PROFILE_ID,
+                    new Object[]{ userId, ShareUser.ACCESS_NONE, profileId, ShareUser.ACCESS_NONE, userId, profileId, name }, int.class);
+        } catch (EmptyResultDataAccessException ex) {
+            return -1;
+        }
+    }
+
+    public int selectDataPointIdWithAccessPrev(String name) {
+        try {
+            return DAO.getInstance().getJdbcTemp().queryForObject(DATA_POINT_SELECT_ONLY_ID + " where " + DATA_POINT_PREV,
+                    new Object[] { name }, int.class);
+        } catch (EmptyResultDataAccessException ex) {
+            return -1;
+        }
+    }
+
+    public int selectDataPointIdWithAccessNext(String name) {
+        try {
+            return DAO.getInstance().getJdbcTemp().queryForObject(DATA_POINT_SELECT_ONLY_ID + " where " + DATA_POINT_NEXT,
+                    new Object[]{ name }, int.class);
+        } catch (EmptyResultDataAccessException ex) {
+            return -1;
+        }
+    }
 }
diff --git a/src/org/scada_lts/dao/event/EventDAO.java b/src/org/scada_lts/dao/event/EventDAO.java
index dd62a40744..f257547571 100644
--- a/src/org/scada_lts/dao/event/EventDAO.java
+++ b/src/org/scada_lts/dao/event/EventDAO.java
@@ -1379,7 +1379,7 @@ public EventType getEventHandlerType(int handlerId) {
 	}
 	
 	public List<EventHandlerVO> getEventHandlers(int typeId, int ref1, int ref2) {
-		if(ref2 > 0 && (typeId == EventType.EventSources.DATA_POINT || typeId == EventType.EventSources.DATA_SOURCE))
+		if(ref2 > 0 && (typeId == EventType.EventSources.DATA_POINT || typeId == EventType.EventSources.DATA_SOURCE || typeId == EventType.EventSources.PUBLISHER))
 			return (List<EventHandlerVO>) DAO.getInstance().getJdbcTemp().query(EVENT_HANDLER_SELECT+" where "+ EVENT_HANDLER_FILTER_REF2, new Object[] {typeId, ref1, ref2}, new EventHandlerRowMapper());
 		return (List<EventHandlerVO>) DAO.getInstance().getJdbcTemp().query(EVENT_HANDLER_SELECT+" where "+ EVENT_HANDLER_FILTER_N, new Object[] {typeId, ref1}, new EventHandlerRowMapper());
 	}
diff --git a/src/org/scada_lts/dao/model/DataPointIdentifier.java b/src/org/scada_lts/dao/model/DataPointIdentifier.java
index 7cf4d0bb5c..ed4403a574 100644
--- a/src/org/scada_lts/dao/model/DataPointIdentifier.java
+++ b/src/org/scada_lts/dao/model/DataPointIdentifier.java
@@ -1,5 +1,6 @@
 package org.scada_lts.dao.model;
 
+import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.PointDataType;
 
 public class DataPointIdentifier extends ScadaObjectIdentifier {
@@ -11,9 +12,22 @@ public class DataPointIdentifier extends ScadaObjectIdentifier {
     private int type;
     private int typeId;
     private String datasourceName;
+    private boolean settable;
+
+    public DataPointIdentifier(DataPointVO dataPoint) {
+        super(dataPoint.getId(), dataPoint.getXid(), dataPoint.getName());
+        this.extendName = dataPoint.getExtendedName();
+        this.dataType = PointDataType.byCode(dataPoint.getPointLocator().getDataTypeId());
+        this.enabled = dataPoint.isEnabled();
+        this.description = dataPoint.getDescription();
+        this.type = dataType.getCode();
+        this.typeId = dataType.getCode();
+        this.datasourceName = dataPoint.getDataSourceName();
+        this.settable = dataPoint.getPointLocator().isSettable();
+    }
 
     private DataPointIdentifier(int id, String xid, String name, String extendName, PointDataType dataType,
-                               boolean enabled, String description, String datasourceName) {
+                               boolean enabled, String description, String datasourceName, boolean settable) {
         super(id, xid, name);
         this.extendName = extendName;
         this.dataType = dataType;
@@ -22,6 +36,7 @@ private DataPointIdentifier(int id, String xid, String name, String extendName,
         this.type = dataType.getCode();
         this.typeId = dataType.getCode();
         this.datasourceName = datasourceName;
+        this.settable = settable;
     }
 
     public static Builder builder(PointDataType dataType) {
@@ -38,6 +53,7 @@ public static class Builder {
         private boolean enabled;
         private String description;
         private String datasourceName;
+        private boolean settable;
 
         public Builder(PointDataType dataType) {
             this.dataType = dataType;
@@ -78,8 +94,13 @@ public Builder dataSourceName(String datasourceName) {
             return this;
         }
 
+        public Builder settable(boolean settable) {
+            this.settable = settable;
+            return this;
+        }
+
         public DataPointIdentifier build() {
-            return new DataPointIdentifier(id, xid, name, extendName, dataType, enabled, description, datasourceName);
+            return new DataPointIdentifier(id, xid, name, extendName, dataType, enabled, description, datasourceName, settable);
         }
     }
 
@@ -139,6 +160,14 @@ public void setDatasourceName(String datasourceName) {
         this.datasourceName = datasourceName;
     }
 
+    public boolean isSettable() {
+        return settable;
+    }
+
+    public void setSettable(boolean settable) {
+        this.settable = settable;
+    }
+
     @Override
     public String getExtendedName() {
         return this.getExtendName();
diff --git a/src/org/scada_lts/mango/adapter/MangoDataPoint.java b/src/org/scada_lts/mango/adapter/MangoDataPoint.java
index b15611f572..50d8144bba 100644
--- a/src/org/scada_lts/mango/adapter/MangoDataPoint.java
+++ b/src/org/scada_lts/mango/adapter/MangoDataPoint.java
@@ -25,6 +25,7 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
 
 /**
  * DataPointService adapter
@@ -94,4 +95,16 @@ public interface MangoDataPoint {
 	List<DataPointVO> getDataPointsWithAccess(User user);
 
 	List<DataPointVO> getDataPoints(String dataSourceXid, Comparator<DataPointVO> comparator);
+
+	List<DataPointVO> getDataPoints(Set<Integer> ids);
+
+	List<DataPointVO> getDataPoints(String keywordSearch, Set<Integer> excludeIds, boolean start, int offset, int limit);
+
+	List<DataPointVO> getDataPointsWithAccess(User user, boolean includeRelationalData);
+
+	int getDataPointIdWithAccessPrev(User user, String dataPointName);
+
+	int getDataPointIdWithAccessNext(User user, String dataPointName);
+
+	List<DataPointVO> getDataPoints(Set<Integer> pointIds, User user);
 }
diff --git a/src/org/scada_lts/mango/service/DataPointService.java b/src/org/scada_lts/mango/service/DataPointService.java
index 0ad1371295..3febbdcee8 100644
--- a/src/org/scada_lts/mango/service/DataPointService.java
+++ b/src/org/scada_lts/mango/service/DataPointService.java
@@ -28,7 +28,6 @@
 import com.serotonin.mango.rt.dataImage.types.MangoValue;
 import com.serotonin.mango.rt.event.type.AuditEventType;
 import com.serotonin.mango.rt.event.type.AuditEventUtils;
-import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.vo.DataPointExtendedNameComparator;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
@@ -41,14 +40,15 @@
 import com.serotonin.mango.vo.link.PointLinkVO;
 import com.serotonin.mango.vo.permission.Permissions;
 import com.serotonin.util.Tuple;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.LogFactory;
 import org.jfree.util.Log;
 import org.scada_lts.dao.*;
+import org.scada_lts.dao.model.ScadaObjectIdentifier;
 import org.scada_lts.dao.model.point.PointValue;
 import org.scada_lts.dao.pointhierarchy.PointHierarchyDAO;
 import org.scada_lts.dao.pointvalues.PointValueAmChartDAO;
 import org.scada_lts.dao.pointvalues.PointValueDAO;
-import org.scada_lts.dao.pointvalues.PointValueDAO4REST;
 import org.scada_lts.dao.watchlist.WatchListDAO;
 import org.scada_lts.mango.adapter.MangoDataPoint;
 import org.scada_lts.mango.adapter.MangoPointHierarchy;
@@ -59,7 +59,6 @@
 import org.scada_lts.web.mvc.api.AggregateSettings;
 import org.scada_lts.web.mvc.api.dto.PointValueDTO;
 import org.scada_lts.web.mvc.api.json.JsonBinaryEventTextRenderer;
-import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.stereotype.Service;
@@ -234,6 +233,7 @@ public Map<DataPointVO, List<PointValue>> getDataPoints(String partOfNameDS, Str
 		return pointsWithListData;
 	}
 
+	@Deprecated(since = "2.8.1")
 	public List<DataPointVO> searchDataPoints(String[] keywords) {
 		return dataPointDAO.getDataPointByKeyword(keywords);
 	}
@@ -634,20 +634,18 @@ public List<Map<String, Double>> getPointValuesToCompareFromRange(List<DataPoint
 		return pointValueAmChartDao.getPointValuesToCompareFromRange(getPointIds(dataPoints), startTs, endTs);
 	}
 
+	@Override
     public List<DataPointVO> getDataPoints(Set<Integer> pointIds) {
-        return pointIds.stream()
-                .map(a -> getDataPointOpt(a))
-				.filter(Optional::isPresent)
-				.map(Optional::get)
-				.peek(a -> {
-					if(a.getPointLocator() == null) {
-						LOG.warn(LoggingUtils.dataPointInfo(a));
-					}
-				})
-				.filter(a -> a.getPointLocator() != null)
-                .collect(Collectors.toList());
+		return dataPointDAO.selectDataPoints(pointIds);
     }
 
+	@Override
+	public List<DataPointVO> getDataPoints(Set<Integer> pointIds, User user) {
+		return dataPointDAO.selectDataPoints(pointIds).stream()
+				.filter(point -> GetDataPointsWithAccess.hasDataPointReadPermission(user, point))
+				.collect(Collectors.toList());
+	}
+
 	public List<DataPointVO> getDataPointsByXid(Set<String> xids) {
 		List<DataPointVO> pointIds = new ArrayList<>();
 		for(String xid: xids) {
@@ -695,17 +693,6 @@ private List<PointValueAmChartDAO.DataPointSimpleValue> aggregateSortValues(long
 				.collect(Collectors.toList());
 	}
 
-	private Optional<DataPointVO> getDataPointOpt(Integer a) {
-		if(a == null)
-			return Optional.empty();
-		try {
-			return Optional.ofNullable(getDataPoint(a));
-		} catch (Exception ex) {
-			LOG.error(ex.getMessage());
-			return Optional.empty();
-		}
-	}
-
 	public DataPointVO createDataPoint(DataPointVO dataPoint) {
 		dataPoint.setEventDetectors(new ArrayList<>());
 		dataPoint.setTextRenderer(new NoneRenderer());
@@ -715,6 +702,7 @@ public DataPointVO createDataPoint(DataPointVO dataPoint) {
 	}
 
 	@Override
+	@Deprecated(since = "2.8.1")
 	public List<DataPointVO> searchDataPointsBy(String searchText) {
 		if (searchText != null) {
 			String[] keywords = searchText.split("\\s+");
@@ -723,6 +711,39 @@ public List<DataPointVO> searchDataPointsBy(String searchText) {
 		return getDataPoints(Comparator.comparing(DataPointVO::getName), false);
 	}
 
+	@Override
+	public List<DataPointVO> getDataPoints(String keywordSearch, Set<Integer> excludeIds, boolean startsWith, int page, int limit) {
+		if (!StringUtils.isEmpty(keywordSearch)) {
+			Set<String> keywords = Set.of(keywordSearch);
+			return dataPointDAO.getDataPointByKeywords(keywords, excludeIds, startsWith, page * limit, limit);
+		} else {
+			return dataPointDAO.getDataPointByKeywords(Collections.emptySet(), excludeIds, startsWith, page * limit, limit);
+		}
+	}
+
+	@Override
+	public List<DataPointVO> getDataPointsWithAccess(User user, boolean includeRelationalData) {
+		List<DataPointVO> dps = getDataPointsWithAccess(user);
+		if(includeRelationalData) {
+			setRelationalData(dps);
+		}
+		return dps;
+	}
+
+	@Override
+	public int getDataPointIdWithAccessPrev(User user, String startDataPointName) {
+		if(user.isAdmin())
+			return dataPointDAO.selectDataPointIdWithAccessPrev(startDataPointName);
+		return dataPointDAO.selectDataPointIdWithAccessPrev(user.getId(), user.getUserProfile(), startDataPointName);
+	}
+
+	@Override
+	public int getDataPointIdWithAccessNext(User user, String startDataPointName) {
+		if(user.isAdmin())
+			return dataPointDAO.selectDataPointIdWithAccessNext(startDataPointName);
+		return dataPointDAO.selectDataPointIdWithAccessNext(user.getId(), user.getUserProfile(), startDataPointName);
+	}
+
 	private void save(User user, String value, DataPointVO point, SetPointSource source) {
 		Permissions.ensureDataPointSetPermission(user, point);
 		setPointImpl(point, value, source);
diff --git a/src/org/scada_lts/permissions/migration/dao/OnlyMigrationDataPointService.java b/src/org/scada_lts/permissions/migration/dao/OnlyMigrationDataPointService.java
index fe1a8710b6..379b690af2 100644
--- a/src/org/scada_lts/permissions/migration/dao/OnlyMigrationDataPointService.java
+++ b/src/org/scada_lts/permissions/migration/dao/OnlyMigrationDataPointService.java
@@ -206,4 +206,34 @@ public List<DataPointVO> getDataPointsWithAccess(User user) {
 	public List<DataPointVO> getDataPoints(String dataSourceXid, Comparator<DataPointVO> comparator) {
 		throw new UnsupportedOperationException();
 	}
+
+	@Override
+	public List<DataPointVO> getDataPoints(String searchText, Set<Integer> excludeIds, boolean start, int offset, int limit) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<DataPointVO> getDataPoints(Set<Integer> ids) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<DataPointVO> getDataPointsWithAccess(User user, boolean includeRelationalData) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int getDataPointIdWithAccessPrev(User user, String startDataPointName) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int getDataPointIdWithAccessNext(User user, String startDataPointName) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<DataPointVO> getDataPoints(Set<Integer> pointIds, User user) {
+		throw new UnsupportedOperationException();
+	}
 }
diff --git a/src/org/scada_lts/permissions/service/GetDataPointsWithAccess.java b/src/org/scada_lts/permissions/service/GetDataPointsWithAccess.java
index abf4fea17d..f5a1d301ed 100644
--- a/src/org/scada_lts/permissions/service/GetDataPointsWithAccess.java
+++ b/src/org/scada_lts/permissions/service/GetDataPointsWithAccess.java
@@ -8,6 +8,7 @@
 import org.scada_lts.dao.DataPointDAO;
 import org.scada_lts.dao.model.ScadaObjectIdentifier;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -61,7 +62,7 @@ public boolean hasOwnerPermission(User user, DataPointVO object) {
         return user.isAdmin();
     }
 
-    public static List<DataPointVO> filteringByAccess(User user, List<DataPointVO> dataPoints) {
+    public static List<DataPointVO> filteringByAccess(User user, Collection<DataPointVO> dataPoints) {
         return dataPoints.stream()
                 .filter(point -> Permissions.hasDataPointReadPermission(user, point))
                 .collect(Collectors.toList());
diff --git a/src/org/scada_lts/utils/GetDataPointValuesUtils.java b/src/org/scada_lts/utils/GetDataPointValuesUtils.java
new file mode 100644
index 0000000000..40fbfbb051
--- /dev/null
+++ b/src/org/scada_lts/utils/GetDataPointValuesUtils.java
@@ -0,0 +1,25 @@
+package org.scada_lts.utils;
+
+import com.serotonin.mango.rt.dataImage.PointValueFacade;
+import com.serotonin.mango.rt.dataImage.PointValueTime;
+
+import java.util.List;
+
+public final class GetDataPointValuesUtils {
+
+    private GetDataPointValuesUtils() {}
+
+    public static List<PointValueTime> getDataPointValues(long from, long to, int dataPointId) {
+        PointValueFacade pointValueFacade = new PointValueFacade(dataPointId);
+        List<PointValueTime> pointData;
+        if (from == -1 && to == -1)
+            pointData = pointValueFacade.getPointValues(0);
+        else if (from == -1)
+            pointData = pointValueFacade.getPointValuesBetween(0, to);
+        else if (to == -1)
+            pointData = pointValueFacade.getPointValues(from);
+        else
+            pointData = pointValueFacade.getPointValuesBetween(from, to);
+        return pointData;
+    }
+}
\ No newline at end of file
diff --git a/src/org/scada_lts/utils/GetDataPointsUtils.java b/src/org/scada_lts/utils/GetDataPointsUtils.java
new file mode 100644
index 0000000000..1ebcdd6d4d
--- /dev/null
+++ b/src/org/scada_lts/utils/GetDataPointsUtils.java
@@ -0,0 +1,231 @@
+package org.scada_lts.utils;
+
+import br.org.scadabr.vo.scripting.ContextualizedScriptVO;
+import com.serotonin.db.IntValuePair;
+import com.serotonin.db.KeyValuePair;
+import com.serotonin.mango.Common;
+import com.serotonin.mango.DataTypes;
+import com.serotonin.mango.rt.event.handlers.SetPointHandlerRT;
+import com.serotonin.mango.view.View;
+import com.serotonin.mango.view.component.CompoundChild;
+import com.serotonin.mango.view.component.CompoundComponent;
+import com.serotonin.mango.view.component.PointComponent;
+import com.serotonin.mango.view.component.ViewComponent;
+import com.serotonin.mango.vo.DataPointExtendedNameComparator;
+import com.serotonin.mango.vo.DataPointVO;
+import com.serotonin.mango.vo.User;
+import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
+import com.serotonin.mango.vo.event.EventHandlerVO;
+import com.serotonin.mango.vo.link.PointLinkVO;
+import com.serotonin.mango.vo.permission.Permissions;
+import com.serotonin.mango.vo.publish.PublishedPointVO;
+import com.serotonin.mango.vo.publish.PublisherVO;
+import com.serotonin.mango.vo.report.ReportPointVO;
+import com.serotonin.mango.vo.report.ReportVO;
+import com.serotonin.mango.web.dwr.beans.DataPointBean;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.mango.service.EventService;
+import org.scada_lts.permissions.service.GetDataPointsWithAccess;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+
+public final class GetDataPointsUtils {
+
+    private GetDataPointsUtils() {}
+
+    public static List<DataPointVO> getDataPointsByDataSource(User user, int dataSourceId, DataPointService dataPointService) {
+        return getDataPointsByDataSource(user, dataSourceId, point -> point, dataPointService);
+    }
+
+    public static List<DataPointBean> getDataPointsByReport(User user, ReportVO report, DataPointService dataPointService) {
+        return getDataPointsByReport(user, report, DataPointBean::new, dataPointService);
+    }
+
+    public static List<DataPointBean> getDataPointsByScript(User user, ContextualizedScriptVO contextualizedScriptVO, DataPointService dataPointService) {
+        return getDataPointsByScript(user, contextualizedScriptVO, DataPointBean::new, dataPointService);
+    }
+
+    public static List<DataPointBean> getDataPointsByEventHandlers(User user, List<EventHandlerVO> eventHandlers, DataPointService dataPointService) {
+        return getDataPointsByEventHandlers(user, eventHandlers, DataPointBean::new, dataPointService);
+    }
+
+    public static List<DataPointBean> getDataPointsByPublishers(User user, List<PublisherVO<?>> publishers, DataPointService dataPointService) {
+        return getDataPointsByPublishers(user, publishers, DataPointBean::new, dataPointService);
+    }
+
+    public static Set<DataPointBean> getDataPointsByChildren(User user, List<KeyValuePair> childPointIds, DataPointService dataPointService) {
+        return new HashSet<>(getDataPointsByChildren(user, childPointIds, DataPointBean::new, dataPointService));
+    }
+
+    public static Set<DataPointBean> getDataPointsByView(User user, View view, DataPointService dataPointService) {
+        return new HashSet<>(getDataPointsByView(user, view, DataPointBean::new, dataPointService));
+    }
+
+    public static Set<DataPointBean> getTargetDataPointsByPointLinks(User user, List<PointLinkVO> pointLinks, DataPointService dataPointService) {
+        Set<DataPointBean> dataPoints = new HashSet<>();
+        for (PointLinkVO pointLinkVO : pointLinks) {
+            DataPointVO targetDataPoint = dataPointService.getDataPoint(pointLinkVO.getTargetPointId());
+            if(targetDataPoint != null && targetDataPoint.getPointLocator() != null
+                    && targetDataPoint.getPointLocator().isSettable()
+                    && GetDataPointsWithAccess.hasDataPointSetPermission(user, targetDataPoint))
+                dataPoints.add(new DataPointBean(targetDataPoint));
+        }
+        return dataPoints;
+    }
+
+    public static Set<DataPointBean> getSourceDataPointsByPointLinks(User user, List<PointLinkVO> pointLinks, DataPointService dataPointService) {
+        Set<DataPointBean> dataPoints = new HashSet<>();
+        for (PointLinkVO pointLinkVO : pointLinks) {
+            DataPointVO sourceDataPoint = dataPointService.getDataPoint(pointLinkVO.getSourcePointId());
+            if(sourceDataPoint != null && GetDataPointsWithAccess.hasDataPointReadPermission(user, sourceDataPoint))
+                dataPoints.add(new DataPointBean(sourceDataPoint));
+        }
+        return dataPoints;
+    }
+
+    public static Set<DataPointBean> getDataPointsByEventHandlers() {
+        User user = Common.getUser();
+        Permissions.ensureAdmin(user);
+
+        EventService eventService = new EventService();
+
+        List<EventHandlerVO> eventHandlers = eventService.getEventHandlers();
+        return new HashSet<>(GetDataPointsUtils.getDataPointsByEventHandlers(user, eventHandlers, new DataPointService()));
+    }
+
+    public static List<DataPointBean> getContextPoints(MetaPointLocatorVO locator, User user, DataPointService dataPointService) {
+        return dataPointService.getDataPoints(locator.getContext().stream()
+                        .map(IntValuePair::getKey)
+                        .collect(Collectors.toSet()), user).stream()
+                .map(DataPointBean::new)
+                .collect(Collectors.toList());
+    }
+
+    private static Set<Integer> getDataPointIdsByViewComponents(View view) {
+        Set<Integer> ids = new HashSet<>();
+        for(ViewComponent viewComponent: view.getViewComponents()) {
+            if(viewComponent instanceof CompoundComponent) {
+                CompoundComponent compoundComponent = (CompoundComponent) viewComponent;
+                for(CompoundChild child: compoundComponent.getChildComponents()) {
+                    if(child.getViewComponent() instanceof PointComponent) {
+                        PointComponent childPoint = (PointComponent) child.getViewComponent();
+                        ids.add(childPoint.getDataPointId());
+                    }
+                }
+            } else if(viewComponent instanceof PointComponent) {
+                PointComponent pointComponent = (PointComponent) viewComponent;
+                ids.add(pointComponent.getDataPointId());
+            }
+        }
+        return ids;
+    }
+
+    private static Set<DataPointVO> getDataPointsByEventHandlers(List<EventHandlerVO> eventHandlers, DataPointService dataPointService, User user) {
+        Set<DataPointVO> dataPoints = new HashSet<>();
+        for (EventHandlerVO eventHandler : eventHandlers) {
+            if(eventHandler.createRuntime() instanceof SetPointHandlerRT) {
+                DataPointVO targetPoint = dataPointService.getDataPoint(eventHandler.getTargetPointId());
+                DataPointVO activePoint = dataPointService.getDataPoint(eventHandler.getActivePointId());
+                DataPointVO inactivePoint = dataPointService.getDataPoint(eventHandler.getInactivePointId());
+                if (targetPoint != null && GetDataPointsWithAccess.hasDataPointSetPermission(user, targetPoint)) {
+                    dataPoints.add(targetPoint);
+                }
+                if (activePoint != null && GetDataPointsWithAccess.hasDataPointReadPermission(user, activePoint)) {
+                    dataPoints.add(activePoint);
+                }
+                if (inactivePoint != null && GetDataPointsWithAccess.hasDataPointReadPermission(user, inactivePoint)) {
+                    dataPoints.add(inactivePoint);
+                }
+            }
+        }
+        return dataPoints;
+    }
+
+    private static <T> List<T> getDataPointsByChildren(User user, List<KeyValuePair> childPointIds, Function<DataPointVO, T> converter, DataPointService dataPointService) {
+        Set<Integer> ids = childPointIds.stream().map(pair -> convertToInt(pair.getValue())).collect(Collectors.toSet());
+        return dataPointService.getDataPoints(ids)
+                .stream()
+                .filter(point -> GetDataPointsWithAccess.hasDataPointReadPermission(user, point))
+                .map(converter)
+                .collect(Collectors.toList());
+    }
+
+    private static <T> List<T> getDataPointsByView(User user, View view, Function<DataPointVO, T> converter, DataPointService dataPointService) {
+        Set<Integer> ids = getDataPointIdsByViewComponents(view);
+        return dataPointService.getDataPoints(ids).stream()
+                .filter(point -> GetDataPointsWithAccess.hasDataPointReadPermission(user, point))
+                .map(converter)
+                .collect(Collectors.toList());
+    }
+
+    private static <T> List<T> getDataPointsByReport(User user, ReportVO report, Function<DataPointVO, T> converter, DataPointService dataPointService) {
+        Set<Integer> ids = report.getPoints().stream().map(ReportPointVO::getPointId).collect(Collectors.toSet());
+        return dataPointService.getDataPoints(ids).stream()
+                .filter(point -> GetDataPointsWithAccess.hasDataPointReadPermission(user, point))
+                .map(converter)
+                .collect(Collectors.toList());
+    }
+
+    private static <T> List<T> getDataPointsByScript(User user, ContextualizedScriptVO contextualizedScriptVO,
+                                                    Function<DataPointVO, T> converter, DataPointService dataPointService) {
+        Set<Integer> ids = new HashSet<>();
+        for(IntValuePair pair : contextualizedScriptVO.getPointsOnContext()) {
+            ids.add(pair.getKey());
+        }
+        return dataPointService.getDataPoints(ids).stream()
+                .filter(point -> GetDataPointsWithAccess.hasDataPointReadPermission(user, point))
+                .map(converter)
+                .collect(Collectors.toList());
+    }
+
+    private static <T> List<T> getDataPointsByDataSource(User user, int dataSourceId, Function<DataPointVO, T> converter, DataPointService dataPointService) {
+        if(dataSourceId == Common.NEW_ID) {
+            return Collections.emptyList();
+        }
+        return dataPointService.getDataPoints(dataSourceId, DataPointExtendedNameComparator.instance).stream()
+                .filter(point -> GetDataPointsWithAccess.hasDataPointReadPermission(user, point))
+                .map(converter)
+                .collect(Collectors.toList());
+    }
+
+    private static <T> List<T> getDataPointsByPublishers(User user, List<PublisherVO<?>> publishers, Function<DataPointVO, T> converter, DataPointService dataPointService) {
+        Set<Integer> ids = new HashSet<>();
+
+        for (PublisherVO<?> publisher: publishers) {
+            List<PublishedPointVO> points = (List<PublishedPointVO>) publisher.getPoints();
+            for(PublishedPointVO point: points) {
+                ids.add(point.getDataPointId());
+            }
+        }
+        return dataPointService.getDataPoints(ids).stream()
+                .filter(dp -> dp.getPointLocator().getDataTypeId() != DataTypes.IMAGE)
+                .filter(point -> GetDataPointsWithAccess.hasDataPointReadPermission(user, point))
+                .sorted(DataPointExtendedNameComparator.instance)
+                .peek(a -> a.setEnabled(a.isEnabled() && Common.ctx.getRuntimeManager().isDataSourceRunning(a.getDataSourceId())))
+                .map(converter)
+                .collect(Collectors.toList());
+    }
+
+    private static <T> List<T> getDataPointsByEventHandlers(User user, List<EventHandlerVO> eventHandlers, Function<DataPointVO, T> converter, DataPointService dataPointService) {
+        if(eventHandlers.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return getDataPointsByEventHandlers(eventHandlers, dataPointService, user).stream()
+                .map(converter)
+                .collect(Collectors.toList());
+    }
+
+    private static int convertToInt(String value) {
+        try {
+            return Integer.parseInt(value);
+        } catch (Exception ex) {
+            return 0;
+        }
+    }
+}
diff --git a/src/org/scada_lts/utils/ValidationUtils.java b/src/org/scada_lts/utils/ValidationUtils.java
index c4e6189a82..b7e012a949 100644
--- a/src/org/scada_lts/utils/ValidationUtils.java
+++ b/src/org/scada_lts/utils/ValidationUtils.java
@@ -134,6 +134,13 @@ public static void checkIfNonAdminThenUnauthorized(HttpServletRequest request) {
         }
     }
 
+    public static void checkIfLogoutThenUnauthorized(HttpServletRequest request) {
+        User user = Common.getUser(request);
+        if (user == null) {
+            throw new UnauthorizedException(request.getRequestURI());
+        }
+    }
+
     public static boolean isCyclicDependency(int starDataPointId, int findDataPointId, Map<Integer, DataPointVO> dataPoints) {
         int validationSearchCyclicDepth = SystemSettingsUtils.getValidationSearchCyclicDepth();
         return isCyclicDependency(starDataPointId, findDataPointId, validationSearchCyclicDepth, dataPoints);
diff --git a/src/org/scada_lts/web/beans/serializer/LocalizableMessageSerializer.java b/src/org/scada_lts/web/beans/serializer/LocalizableMessageSerializer.java
new file mode 100644
index 0000000000..1d94995bbd
--- /dev/null
+++ b/src/org/scada_lts/web/beans/serializer/LocalizableMessageSerializer.java
@@ -0,0 +1,21 @@
+package org.scada_lts.web.beans.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import com.serotonin.mango.Common;
+import com.serotonin.web.i18n.LocalizableMessage;
+
+import java.io.IOException;
+
+public class LocalizableMessageSerializer extends StdSerializer<LocalizableMessage> {
+
+    public LocalizableMessageSerializer() {
+        super(LocalizableMessage.class);
+    }
+
+    @Override
+    public void serialize(LocalizableMessage value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+        jgen.writeString(value.getLocalizedMessage(Common.getBundle()));
+    }
+}
diff --git a/src/org/scada_lts/web/beans/serializer/PointDataTypeSerializer.java b/src/org/scada_lts/web/beans/serializer/PointDataTypeSerializer.java
new file mode 100644
index 0000000000..b0dce19ddb
--- /dev/null
+++ b/src/org/scada_lts/web/beans/serializer/PointDataTypeSerializer.java
@@ -0,0 +1,20 @@
+package org.scada_lts.web.beans.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import com.serotonin.mango.vo.PointDataType;
+
+import java.io.IOException;
+
+public class PointDataTypeSerializer extends StdSerializer<PointDataType> {
+
+    public PointDataTypeSerializer() {
+        super(PointDataType.class);
+    }
+
+    @Override
+    public void serialize(PointDataType value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+        jgen.writeString(value.getMessageText());
+    }
+}
diff --git a/src/org/scada_lts/web/mvc/api/DataPointAPI.java b/src/org/scada_lts/web/mvc/api/DataPointAPI.java
index bbbd8b2dc6..e4bf8af2f5 100644
--- a/src/org/scada_lts/web/mvc/api/DataPointAPI.java
+++ b/src/org/scada_lts/web/mvc/api/DataPointAPI.java
@@ -18,11 +18,13 @@
 package org.scada_lts.web.mvc.api;
 
 import com.serotonin.mango.vo.DataPointVO;
+import com.serotonin.mango.web.dwr.beans.DataPointBean;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.dao.model.DataPointIdentifier;
 import org.scada_lts.web.mvc.api.datasources.DataPointJson;
 
+import org.scada_lts.web.mvc.api.datasources.SearchDataPointJson;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -130,11 +132,18 @@ public ResponseEntity<List<DataPointIdentifier>> getDataPointIdentifiersByDataSo
     }
 
     @GetMapping(value = "/api/datapoints")
-    public ResponseEntity<List<DataPointIdentifier>> searchDataPointIdentifiers(@RequestParam(value="keywordSearch", required = false) String searchText,
+    public ResponseEntity<List<DataPointIdentifier>> searchDataPointIdentifiers(@Valid SearchDataPointJson searchDataPoint,
                                                                                 HttpServletRequest request) {
         LOG.debug(request.getRequestURI());
+        List<DataPointIdentifier> response = dataPointApiService.searchDataPointIdentifiers(request, searchDataPoint);
+        return new ResponseEntity<>(response, HttpStatus.OK);
+    }
 
-        List<DataPointIdentifier> response = dataPointApiService.searchDataPointIdentifiers(request, searchText);
+    @GetMapping(value = "/api/datapoints/bean")
+    public ResponseEntity<List<DataPointBean>> searchDataPointBean(@Valid SearchDataPointJson searchDataPoint,
+                                                                   HttpServletRequest request) {
+        LOG.debug(request.getRequestURI());
+        List<DataPointBean> response = dataPointApiService.searchDataPointBean(request, searchDataPoint);
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
diff --git a/src/org/scada_lts/web/mvc/api/DataPointApiService.java b/src/org/scada_lts/web/mvc/api/DataPointApiService.java
index c23257fbdd..22e2f1e5c1 100644
--- a/src/org/scada_lts/web/mvc/api/DataPointApiService.java
+++ b/src/org/scada_lts/web/mvc/api/DataPointApiService.java
@@ -1,9 +1,11 @@
 package org.scada_lts.web.mvc.api;
 
 import com.serotonin.mango.Common;
+import com.serotonin.mango.vo.DataPointExtendedNameComparator;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.web.dwr.EmportDwr;
+import com.serotonin.mango.web.dwr.beans.DataPointBean;
 import org.scada_lts.dao.model.DataPointIdentifier;
 import org.scada_lts.mango.service.DataPointService;
 import org.scada_lts.permissions.service.GetDataPointsWithAccess;
@@ -11,6 +13,7 @@
 import org.scada_lts.utils.ApiUtils;
 import org.scada_lts.web.mvc.api.datasources.DataPointJson;
 import org.scada_lts.web.mvc.api.datasources.DataSourcePointJsonFactory;
+import org.scada_lts.web.mvc.api.datasources.SearchDataPointJson;
 import org.scada_lts.web.mvc.api.exceptions.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -19,6 +22,7 @@
 
 import java.util.*;
 import java.util.function.BiConsumer;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -231,6 +235,7 @@ public List<DataPointIdentifier> getDataPointIdentifiersByTypes(HttpServletReque
         return response;
     }
 
+    @Deprecated(since = "2.8.1")
     public List<DataPointIdentifier> searchDataPointIdentifiers(HttpServletRequest request, String searchText) {
         User user = Common.getUser(request);
         List<DataPointIdentifier> response;
@@ -260,6 +265,104 @@ public List<DataPointIdentifier> getDataPointIdentifiersPlcByDataSourceId(HttpSe
         return response;
     }
 
+    public List<DataPointBean> searchDataPointBean(HttpServletRequest request,
+                                                   SearchDataPointJson searchDataPointJson) {
+        return searchDataPoint(request, searchDataPointJson).stream().map(DataPointBean::new).collect(Collectors.toList());
+    }
+
+    public List<DataPointIdentifier> searchDataPointIdentifiers(HttpServletRequest request,
+                                                                SearchDataPointJson searchDataPointJson) {
+        return searchDataPoint(request, searchDataPointJson).stream().map(DataPointIdentifier::new).collect(Collectors.toList());
+    }
+
+    public List<DataPointVO> searchDataPoint(HttpServletRequest request,
+                                             SearchDataPointJson searchDataPointJson) {
+
+        checkIfLogoutThenUnauthorized(request);
+        User user = Common.getUser(request);
+        Set<Integer> includeIds = searchDataPointJson.getIncludeIds();
+
+        List<DataPointVO> response = searchDataPoint(request, searchDataPointJson, user);
+        if(includeIds != null && !includeIds.isEmpty()) {
+            if(response.isEmpty()) {
+                return filteringAndPaginationPoints(user, searchDataPointJson, getDataPoints(request, includeIds, user));
+            } else {
+                return response.stream()
+                        .filter(filterByIncludeIds(searchDataPointJson))
+                        .collect(Collectors.toList());
+            }
+        }
+        return response;
+    }
+
+    private List<DataPointVO> searchDataPoint(HttpServletRequest request,
+                                              SearchDataPointJson searchDataPointJson,
+                                              User user) {
+        try {
+            if(user.isAdmin()) {
+                int page = searchDataPointJson.getPage();
+                List<DataPointVO> points;
+                int safe = 5;
+                List<DataPointVO> reponse = new ArrayList<>();
+                do {
+                    points = dataPointService.getDataPoints(searchDataPointJson.getKeywordSearch(),
+                                    searchDataPointJson.getExcludeIds(), searchDataPointJson.isStartsWith(),
+                                    page++, searchDataPointJson.getLimit())
+                            .stream()
+                            .filter(filterByDataTypes(searchDataPointJson))
+                            .filter(filterByPointSettable(searchDataPointJson))
+                            .collect(Collectors.toList());
+                    reponse.addAll(points);
+                    safe--;
+                } while(reponse.size() < searchDataPointJson.getLimit() && safe > 0);
+
+                if(reponse.size() < searchDataPointJson.getLimit()) {
+                    points = dataPointService.getDataPoints(searchDataPointJson.getKeywordSearch(),
+                            searchDataPointJson.getExcludeIds(), searchDataPointJson.isStartsWith(),
+                            -1, -1);
+                    return filteringAndPaginationPoints(user, searchDataPointJson, points);
+                }
+
+                return reponse.stream()
+                        .sorted(DataPointExtendedNameComparator.instance)
+                        .limit(searchDataPointJson.getLimit())
+                        .collect(Collectors.toList());
+            } else {
+                List<DataPointVO> points = dataPointService.getDataPointsWithAccess(user);
+                return filteringAndPaginationPoints(user, searchDataPointJson, points);
+            }
+        } catch (Exception ex) {
+            throw new InternalServerErrorException(ex, request.getRequestURI());
+        }
+    }
+
+    private List<DataPointVO> filteringAndPaginationPoints(User user, SearchDataPointJson searchDataPointJson, List<DataPointVO> points) {
+        return points.stream().sorted(DataPointExtendedNameComparator.instance)
+                .filter(filteringPoints(searchDataPointJson, user))
+                .skip((long) searchDataPointJson.getPage() * searchDataPointJson.getLimit())
+                .limit(searchDataPointJson.getLimit())
+                .collect(Collectors.toList());
+    }
+
+    private Predicate<DataPointVO> filteringPoints(SearchDataPointJson searchDataPointJson, User user) {
+        return filterByDataTypes(searchDataPointJson)
+                .and(filterByExcludeIds(searchDataPointJson))
+                .and(filterByKeywords(searchDataPointJson))
+                .and(filterByIncludeIds(searchDataPointJson))
+                .and(filterByPointSettable(searchDataPointJson))
+                .and(filterByPermissionSet(searchDataPointJson, user));
+    }
+
+    private List<DataPointVO> getDataPoints(HttpServletRequest request, Set<Integer> includeIds, User user) {
+        List<DataPointVO> response;
+        try {
+            response = filteringByAccess(user, dataPointService.getDataPoints(includeIds));
+        } catch (Exception ex) {
+            throw new InternalServerErrorException(ex, request.getRequestURI());
+        }
+        return response;
+    }
+
     private static boolean filteringByTypes(Integer[] types, DataPointVO point) {
         if(types == null)
             return true;
@@ -312,4 +415,43 @@ private static void updateObjectDataPointVO(DataPointVO toUpdate, DataPointJson
         setIf(fromRequest.isEnabled(), toUpdate::setEnabled, Objects::nonNull);
         setIf(fromRequest.isSettable(), toUpdate::setSettable, Objects::nonNull);
     }
+
+    private static Predicate<DataPointVO> filterByKeywords(SearchDataPointJson searchDataPointJson) {
+        return dataPoint -> StringUtils.isEmpty(searchDataPointJson.getKeywordSearch())
+                || (dataPoint.getExtendedName() != null && (searchDataPointJson.isStartsWith()
+                ? toLowerCase(dataPoint.getExtendedName()).startsWith(toLowerCase(searchDataPointJson.getKeywordSearch()))
+                : toLowerCase(dataPoint.getExtendedName()).contains(toLowerCase(searchDataPointJson.getKeywordSearch())))
+        );
+    }
+
+    private static Predicate<DataPointVO> filterByIncludeIds(SearchDataPointJson searchDataPointJson) {
+        Set<Integer> includeIds = searchDataPointJson.getIncludeIds();
+        return dataPoint -> includeIds == null || includeIds.contains(dataPoint.getId());
+    }
+
+    private static Predicate<DataPointVO> filterByExcludeIds(SearchDataPointJson searchDataPointJson) {
+        Set<Integer> excludeIds = searchDataPointJson.getExcludeIds();
+        return dataPoint -> excludeIds == null || excludeIds.isEmpty() || !excludeIds.contains(dataPoint.getId());
+    }
+
+    private static Predicate<DataPointVO> filterByDataTypes(SearchDataPointJson searchDataPointJson) {
+        Set<Integer> dataTypes = searchDataPointJson.getDataTypes();
+        return dataPoint -> dataTypes == null || dataTypes.isEmpty() || (dataPoint.getPointLocator() == null || dataTypes.contains(dataPoint.getPointLocator().getDataTypeId()));
+    }
+
+    private static Predicate<DataPointVO> filterByPointSettable(SearchDataPointJson searchDataPointJson) {
+        Boolean settable = searchDataPointJson.getSettable();
+        return dataPoint -> settable == null || (dataPoint.getPointLocator() != null && settable.equals(dataPoint.getPointLocator().isSettable()));
+    }
+
+    private static Predicate<DataPointVO> filterByPermissionSet(SearchDataPointJson searchDataPointJson, User user) {
+        return dataPoint -> searchDataPointJson.getSettable() == null || Boolean.FALSE.equals(searchDataPointJson.getSettable()) || GetDataPointsWithAccess.hasDataPointSetPermission(user, dataPoint);
+    }
+
+    private static String toLowerCase(String word) {
+        if(StringUtils.isEmpty(word)) {
+            return "";
+        }
+        return word.toLowerCase();
+    }
 }
diff --git a/src/org/scada_lts/web/mvc/api/UsersApiService.java b/src/org/scada_lts/web/mvc/api/UsersApiService.java
index 7fdea32dfb..9127b5af3a 100644
--- a/src/org/scada_lts/web/mvc/api/UsersApiService.java
+++ b/src/org/scada_lts/web/mvc/api/UsersApiService.java
@@ -9,6 +9,7 @@
 import org.scada_lts.mango.service.SystemSettingsService;
 import org.scada_lts.mango.service.UserService;
 import org.scada_lts.utils.ApiUtils;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.exceptions.*;
 import org.scada_lts.web.mvc.api.json.JsonSettingsSystemInfo;
 import org.scada_lts.web.mvc.api.user.UserInfo;
@@ -81,7 +82,7 @@ public UserInfo update(HttpServletRequest request, UserInfo userInfo) {
             throw new InternalServerErrorException(ex, request.getRequestURI());
         }
         if(userInfo.getId() == user.getId()) {
-            Common.updateUserInSession(request, userToSave);
+            ApplicationBeans.getLoggedUsersBean().updateUser(userToSave);
         }
         return toUserInfo(userToSave);
     }
diff --git a/src/org/scada_lts/web/mvc/api/datasources/SearchDataPointJson.java b/src/org/scada_lts/web/mvc/api/datasources/SearchDataPointJson.java
new file mode 100644
index 0000000000..43d6c70e93
--- /dev/null
+++ b/src/org/scada_lts/web/mvc/api/datasources/SearchDataPointJson.java
@@ -0,0 +1,86 @@
+package org.scada_lts.web.mvc.api.datasources;
+
+import org.scada_lts.web.beans.validation.xss.XssProtect;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.PositiveOrZero;
+import java.util.Set;
+
+public class SearchDataPointJson {
+
+    @XssProtect
+    private String keywordSearch;
+    private Set<Integer> includeIds;
+    private Set<Integer> excludeIds;
+    private Set<Integer> dataTypes;
+    @Min(10)
+    private int limit;
+    private boolean startsWith;
+    @PositiveOrZero
+    private int page;
+    private Boolean settable;
+
+    public String getKeywordSearch() {
+        return keywordSearch;
+    }
+
+    public void setKeywordSearch(String keywordSearch) {
+        this.keywordSearch = keywordSearch;
+    }
+
+    public int getLimit() {
+        return limit;
+    }
+
+    public void setLimit(int limit) {
+        this.limit = limit;
+    }
+
+    public Set<Integer> getIncludeIds() {
+        return includeIds;
+    }
+
+    public void setIncludeIds(Set<Integer> includeIds) {
+        this.includeIds = includeIds;
+    }
+
+    public Set<Integer> getExcludeIds() {
+        return excludeIds;
+    }
+
+    public void setExcludeIds(Set<Integer> excludeIds) {
+        this.excludeIds = excludeIds;
+    }
+
+    public Set<Integer> getDataTypes() {
+        return dataTypes;
+    }
+
+    public void setDataTypes(Set<Integer> dataTypes) {
+        this.dataTypes = dataTypes;
+    }
+
+    public boolean isStartsWith() {
+        return startsWith;
+    }
+
+    public void setStartsWith(boolean startsWith) {
+        this.startsWith = startsWith;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public Boolean getSettable() {
+        return settable;
+    }
+
+    public void setSettable(Boolean settable) {
+        this.settable = settable;
+    }
+}
diff --git a/src/org/scada_lts/web/mvc/controller/DataPointEditController.java b/src/org/scada_lts/web/mvc/controller/DataPointEditController.java
index f92d87aa5b..6ff82a4fd1 100644
--- a/src/org/scada_lts/web/mvc/controller/DataPointEditController.java
+++ b/src/org/scada_lts/web/mvc/controller/DataPointEditController.java
@@ -119,7 +119,7 @@ public String showForm(HttpServletRequest request, Model model){
         user.setEditPoint(dataPoint);
         
         Permissions.ensureDataSourcePermission(user, dataPoint.getDataSourceId());
-        ControllerUtils.addPointListDataToModel(user, id, model);
+        ControllerUtils.addPointListDataToModel(model::addAttribute, user, dataPoint);
         model.addAttribute("form", dataPoint);
 		model.addAttribute("dataSource", Common.ctx.getRuntimeManager().getDataSource(dataPoint.getDataSourceId()));
 		model.addAttribute("eventTextRenderers", BaseEventTextRenderer.getImplementation(dataPoint.getPointLocator().getDataTypeId()));
@@ -152,7 +152,7 @@ public String saveDataPoint(HttpServletRequest request, Model model){
         	executeUpdate(request, dataPoint, errors);
         }
         
-        ControllerUtils.addPointListDataToModel(user, dataPoint.getId(), model);
+        ControllerUtils.addPointListDataToModel(model::addAttribute, user, dataPoint);
         model.addAttribute("form", dataPoint);
         model.addAttribute("error", errors);
 		model.addAttribute("dataSource", Common.ctx.getRuntimeManager().getDataSource(dataPoint.getDataSourceId()));
diff --git a/webapp-resources/messages_de.properties b/webapp-resources/messages_de.properties
index 68f2aaec90..b237e98d59 100644
--- a/webapp-resources/messages_de.properties
+++ b/webapp-resources/messages_de.properties
@@ -3434,7 +3434,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3457,4 +3457,5 @@ systemSettings.scadaConfCheck=Check configuration
 validate.unsupportedDataType=Data type {0} is not supported
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file
diff --git a/webapp-resources/messages_en.properties b/webapp-resources/messages_en.properties
index ba5a2c3893..4cb5dd9ec3 100644
--- a/webapp-resources/messages_en.properties
+++ b/webapp-resources/messages_en.properties
@@ -3437,7 +3437,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3461,4 +3461,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file
diff --git a/webapp-resources/messages_es.properties b/webapp-resources/messages_es.properties
index 5c1d9509f2..86910fcf6c 100644
--- a/webapp-resources/messages_es.properties
+++ b/webapp-resources/messages_es.properties
@@ -3477,7 +3477,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3501,4 +3501,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file
diff --git a/webapp-resources/messages_fi.properties b/webapp-resources/messages_fi.properties
index b282d209de..8789827539 100644
--- a/webapp-resources/messages_fi.properties
+++ b/webapp-resources/messages_fi.properties
@@ -3562,7 +3562,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3586,4 +3586,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file
diff --git a/webapp-resources/messages_fr.properties b/webapp-resources/messages_fr.properties
index 5a321e1a49..f758ebc2b2 100644
--- a/webapp-resources/messages_fr.properties
+++ b/webapp-resources/messages_fr.properties
@@ -3431,7 +3431,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3455,4 +3455,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file
diff --git a/webapp-resources/messages_lu.properties b/webapp-resources/messages_lu.properties
index fccb65f0c0..14195bd9a4 100644
--- a/webapp-resources/messages_lu.properties
+++ b/webapp-resources/messages_lu.properties
@@ -3450,7 +3450,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3474,4 +3474,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file
diff --git a/webapp-resources/messages_nl.properties b/webapp-resources/messages_nl.properties
index 272420eb5a..c73a094241 100644
--- a/webapp-resources/messages_nl.properties
+++ b/webapp-resources/messages_nl.properties
@@ -3552,7 +3552,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3576,4 +3576,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file
diff --git a/webapp-resources/messages_pl.properties b/webapp-resources/messages_pl.properties
index 04a3a8a05c..076d01f72b 100644
--- a/webapp-resources/messages_pl.properties
+++ b/webapp-resources/messages_pl.properties
@@ -3574,7 +3574,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3598,4 +3598,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file
diff --git a/webapp-resources/messages_pt.properties b/webapp-resources/messages_pt.properties
index d4f4a6d62d..83a5ba6ca8 100644
--- a/webapp-resources/messages_pt.properties
+++ b/webapp-resources/messages_pt.properties
@@ -3589,7 +3589,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3613,4 +3613,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=Arquivo OK!
 dsEdit.checkFile.notFound=Arquivo não encontrado!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
diff --git a/webapp-resources/messages_ru.properties b/webapp-resources/messages_ru.properties
index 8a21cce10e..3d1ec35273 100644
--- a/webapp-resources/messages_ru.properties
+++ b/webapp-resources/messages_ru.properties
@@ -3585,7 +3585,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3609,4 +3609,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file
diff --git a/webapp-resources/messages_zh.properties b/webapp-resources/messages_zh.properties
index 6ab23cf0ff..0c1ea12c93 100644
--- a/webapp-resources/messages_zh.properties
+++ b/webapp-resources/messages_zh.properties
@@ -3537,7 +3537,7 @@ dsEdit.opcua.searchDepth=Search depth
 dsEdit.opcua.searchDepthLimit=The search depth parameter cannot be greater than {0}, recommended is 3.
 event.ds.pointReadAll=Point read all exception
 viewEdit.copyView=Copy view
-chosen.selector.selectPoint=Select a point...
+chosen.selector.selectPoint=Enter name point...
 event.setPoint.activePointDataTypeX=active source point data type is different than the target point: {0}
 event.setPoint.activePointMissingX=active source point is missing or disabled: {0}
 event.setPoint.activePointValueX=active source point has no value: {0}
@@ -3561,4 +3561,5 @@ validate.unsupportedDataType=Data type {0} is not supported
 
 dsEdit.checkFile.found=File OK!
 dsEdit.checkFile.notFound=File not found!
+publisherEdit.point.xid=XID
 scadalts.security.js.validator.error=Script is invalid!
\ No newline at end of file