diff --git a/WebContent/WEB-INF/jsp/dataPointEdit.jsp b/WebContent/WEB-INF/jsp/dataPointEdit.jsp
index 1ffb2da1b7..8de649b777 100644
--- a/WebContent/WEB-INF/jsp/dataPointEdit.jsp
+++ b/WebContent/WEB-INF/jsp/dataPointEdit.jsp
@@ -396,13 +396,9 @@
                       }
                   }
                   // const
-                  var pathArray = location.href.split( '/' );
-                  var protocol = pathArray[0];
-                  var host = pathArray[2];
-                  var appScada = pathArray[3];
                   var myLocation;
                   if (!myLocation) {
-                    myLocation = protocol + "//" + host + "/" + appScada + "/";
+                    myLocation = getAppLocation();
                    }
 
                    var arrDictLoggingType = ["", "When point value changes", "All data", "Do not log", "Interval", "When point timestamp changes"];
@@ -813,7 +809,7 @@
                     jQuery.ajax({
                             type: "GET",
                             dataType: "json",
-                            url:myLocation+"/api/point_properties/getPropertiesBaseOnId/"+idPointConfigurationToBaseOnExistingPoint,
+                            url:myLocation+"api/point_properties/getPropertiesBaseOnId/"+idPointConfigurationToBaseOnExistingPoint,
                                                            success: function(properties){
                                                                 setConfig(properties);
                                                            },
@@ -836,7 +832,7 @@
                        jQuery.ajax({
                             type: "GET",
                             dataType: "json",
-                            url:myLocation+"/api/point_properties/getPropertiesBaseOnId/"+idPointConfigurationToBaseOnExistingPoint,
+                            url:myLocation+"api/point_properties/getPropertiesBaseOnId/"+idPointConfigurationToBaseOnExistingPoint,
                            					        	   success: function(properties){
 
                                                                     let bCheckedType = checkType(properties.dataTypeId);
diff --git a/WebContent/WEB-INF/jsp/include/highlight.jsp b/WebContent/WEB-INF/jsp/include/highlight.jsp
index 2606160d24..1f2d229dc4 100644
--- a/WebContent/WEB-INF/jsp/include/highlight.jsp
+++ b/WebContent/WEB-INF/jsp/include/highlight.jsp
@@ -13,6 +13,15 @@ function updateCodeText(text, destination) {
     hljs.highlightElement(result_element);
 }
 
+function updateCodeTextEscaped(text, destination) {
+    let result_element = document.querySelector(destination);
+    if(text[text.length-1] == "\n") {
+      text += " ";
+    }
+    result_element.innerHTML = text;
+    hljs.highlightElement(result_element);
+}
+
 function syncCodeScroll(element, destination) {
   let result_element = document.querySelector(destination);
   result_element.scrollTop = element.scrollTop;
diff --git a/WebContent/WEB-INF/jsp/systemSettings.jsp b/WebContent/WEB-INF/jsp/systemSettings.jsp
index 519bdb7606..3e516448b6 100644
--- a/WebContent/WEB-INF/jsp/systemSettings.jsp
+++ b/WebContent/WEB-INF/jsp/systemSettings.jsp
@@ -514,8 +514,9 @@
 
     function initCustomCssData() {
       fetchCustomCssConfig().then((val) => {
-        document.getElementById('cssEditor').value = val;
-        updateCodeText(val, '#cssHighlightingContent');
+        let res = JSON.parse(val);
+        document.getElementById('cssEditor').innerHTML = res.content;
+        updateCodeTextEscaped(res.content, '#cssHighlightingContent');
       });
     }
 
@@ -525,7 +526,7 @@
         req.open('GET', customCssUrl, true);
         req.onload = () => {
           if (req.status === 200) {
-            resolve(req.responseText);
+            resolve(req.response);
           } else {
             reject(req.status);
           }
@@ -1129,7 +1130,7 @@
               id="cssEditor"
               class="hgl-editor"
               spellcheck="false"
-              oninput="updateCodeText(this.value, '#cssHighlightingContent');"
+              oninput="updateCodeTextEscaped(this.value, '#cssHighlightingContent');"
               onscroll="syncCodeScroll(this, '#cssHighlightingContent');">
             </textarea>
             <pre id="cssHighlighting" class="hgl-highlighting" aria-hidden="true">
diff --git a/WebContent/WEB-INF/lib/jackson-annotations-2.17.2.jar b/WebContent/WEB-INF/lib/jackson-annotations-2.17.2.jar
new file mode 100644
index 0000000000..c13bcb9104
Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-annotations-2.17.2.jar differ
diff --git a/WebContent/WEB-INF/lib/jackson-annotations-2.8.2.jar b/WebContent/WEB-INF/lib/jackson-annotations-2.8.2.jar
deleted file mode 100644
index 6b609adc7b..0000000000
Binary files a/WebContent/WEB-INF/lib/jackson-annotations-2.8.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jackson-core-2.17.2.jar b/WebContent/WEB-INF/lib/jackson-core-2.17.2.jar
new file mode 100644
index 0000000000..34be902661
Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-core-2.17.2.jar differ
diff --git a/WebContent/WEB-INF/lib/jackson-core-2.8.2.jar b/WebContent/WEB-INF/lib/jackson-core-2.8.2.jar
deleted file mode 100644
index 54c321e164..0000000000
Binary files a/WebContent/WEB-INF/lib/jackson-core-2.8.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jackson-databind-2.17.2.jar b/WebContent/WEB-INF/lib/jackson-databind-2.17.2.jar
new file mode 100644
index 0000000000..3750b8c1cf
Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-databind-2.17.2.jar differ
diff --git a/WebContent/WEB-INF/lib/jackson-databind-2.8.2.jar b/WebContent/WEB-INF/lib/jackson-databind-2.8.2.jar
deleted file mode 100644
index 503d0f79b6..0000000000
Binary files a/WebContent/WEB-INF/lib/jackson-databind-2.8.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/springDispatcher-servlet.xml b/WebContent/WEB-INF/springDispatcher-servlet.xml
index d7b17a4914..75e5c7f565 100644
--- a/WebContent/WEB-INF/springDispatcher-servlet.xml
+++ b/WebContent/WEB-INF/springDispatcher-servlet.xml
@@ -11,7 +11,11 @@
         http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd">
 
 	<context:component-scan base-package="org.scada_lts" />
-    <mvc:annotation-driven />
+    <mvc:annotation-driven>
+      <mvc:message-converters>
+        <ref bean="messageConverter"/>
+      </mvc:message-converters>
+    </mvc:annotation-driven>
 
 	<context:annotation-config />
     <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
@@ -215,4 +219,17 @@
   <bean id="dataSourceListController" class="org.scada_lts.web.mvc.controller.DataSourceListController" >
     <property name="viewName"><value>dataSourceList</value></property>
   </bean>
+
+  <bean id="objectMapper" class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean" scope="prototype">
+    <property name="serializers">
+      <array>
+        <bean class="org.scada_lts.web.security.XssProtectStringSerializer" />
+        <bean class="org.scada_lts.web.security.XssProtectCssStyleSerializer" />
+      </array>
+    </property>
+  </bean>
+
+  <bean id="messageConverter" class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter" scope="prototype">
+    <constructor-arg ref="objectMapper"/>
+  </bean>
 </beans>
diff --git a/WebContent/resources/common.js b/WebContent/resources/common.js
index 2d48f8c7a3..f01442b46b 100644
--- a/WebContent/resources/common.js
+++ b/WebContent/resources/common.js
@@ -1215,8 +1215,11 @@ function disconnectWebsocket() {
 }
 
 function onloadHandlerWebsocket() {
-    let endpoint = scadalts.websocket.endpoints.main;
-    scadalts.websocket.client = connectWebsocket(getAppLocation() + endpoint, {}, errorCallbackWebsocket, connectCallbackWebsocket);
+    let location = window.location.href;
+    if(!location.includes('app.shtm')) {
+        let endpoint = scadalts.websocket.endpoints.main;
+        scadalts.websocket.client = connectWebsocket(getAppLocation() + endpoint, {}, errorCallbackWebsocket, connectCallbackWebsocket);
+    }
 }
 
 function getAppLocation() {
@@ -1285,4 +1288,10 @@ function unassignEvent(eventId) {
 
 function isEmpty(value) {
     return !value || (typeof value === "string" && value.trim() === "");
+}
+
+function unescapeHtml(value) {
+   let div = document.createElement("div");
+   div.innerHTML = value;
+   return div.textContent || div.innerText;
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5611597879..4a7f3cd209 100644
--- a/build.gradle
+++ b/build.gradle
@@ -146,11 +146,11 @@ task stopDebug(type: Exec) {
 }
 
 task buildRun(type: GradleBuild) {
-    tasks = ['clearTomcat', 'clearProject', 'test', 'war', 'deployTomcat', 'run']
+    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'war', 'deployTomcat', 'run']
 }
 
 task buildRunDebug(type: GradleBuild) {
-    tasks = ['clearTomcat', 'clearProject', 'test', 'war', 'deployTomcat', 'runDebug']
+    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'war', 'deployTomcat', 'runDebug']
 }
 
 task buildRunDebugDev(type: GradleBuild) {
@@ -232,6 +232,7 @@ test {
         includeTestsMatching "com.serotonin.mango.util.AddLimitIfWithoutSqlDataSourceUtilsTest"
         includeTestsMatching "com.serotonin.mango.util.StartStopDataPointsUtilsTestsSuite"
         includeTestsMatching "org.scada_lts.utils.BlockingQueuesUtilsTest"
+        includeTestsMatching "org.scada_lts.web.security.XssProtectHtmlEscapeUtilsTest"
         includeTestsMatching "org.scada_lts.web.security.XssUtilsTest"
     }
 
diff --git a/scadalts-ui/src/layout/lists/events/EventScadaItem.vue b/scadalts-ui/src/layout/lists/events/EventScadaItem.vue
index 3e3bff8a14..39ba32f63c 100644
--- a/scadalts-ui/src/layout/lists/events/EventScadaItem.vue
+++ b/scadalts-ui/src/layout/lists/events/EventScadaItem.vue
@@ -95,10 +95,10 @@
 							</v-list-item-icon>
 							<v-list-item-content>
 								<v-list-item-title>
-									{{ comment.comment }}
+								    <span v-html="comment.comment"></span>
 								</v-list-item-title>
 								<v-list-item-subtitle>
-									{{ comment.username }},
+								    <span v-html="comment.username"></span>,
 									{{ new Date(comment.ts).toLocaleString() }}
 								</v-list-item-subtitle>
 							</v-list-item-content>
@@ -157,7 +157,7 @@ export default {
 	},
 
 	methods: {
-		addComment(e) {
+		async addComment(e) {
 			let time = new Date();
 			let comment = {
 				userId: this.$store.state.loggedUser.id,
@@ -166,13 +166,13 @@ export default {
 				username: this.$store.state.loggedUser.username,
 				prettyTime: time.toLocaleTimeString(),
 			};
-			e.userComments.push(Object.assign({}, comment));
-			this.$store.dispatch('addUserComment', {
+			let response = this.$store.dispatch('addUserComment', {
 				comment: comment,
 				typeId: 1,
 				refId: e.id,
 			});
 			this.newComment = '';
+			e.userComments.push(Object.assign({}, response));
 		},
 
 		deleteComment(e, comment) {
diff --git a/scadalts-ui/src/locales/en.json b/scadalts-ui/src/locales/en.json
index 8e41f97b9e..e0cbf1783b 100644
--- a/scadalts-ui/src/locales/en.json
+++ b/scadalts-ui/src/locales/en.json
@@ -1065,14 +1065,14 @@
 	"systemsettings.webresource.uploads.path.wrong":"Uploaded images save path must end with 'uploads' or 'uploads{0}' ",
 	"systemsettings.webresource.graphics.path.wrong": "Custom Graphics images path must end with 'graphics' or 'graphics{0}' ",
 	"systemsettings.misc.eventAssignEnabled": "Event Assign enabled",
-	"systemsettings.misc.eventPendingCacheEnabled": "Event Pending Limit",
-	"systemsettings.misc.eventPendingLimit": "Enabled Event Pending Cache",
-	"systemsettings.misc.workItemsReportingEnabled": "Work items reporting enabled",
-	"systemsettings.misc.workItemsReportingItemsPerSecondEnabled": "Items per second reporting enabled",
-	"systemsettings.misc.workItemsReportingItemsPerSecondLimit": "Items per second reporting limit",
-	"systemsettings.misc.threadsNameAdditionalLength": "Thread name length",
-	"systemsettings.misc.webResourceUploadsPath": "Uploaded images save path",
-	"systemsettings.misc.webResourceGraphicsPath": "Graphics images path",
+	"systemsettings.misc.eventPendingCacheEnabled": "Event Pending Cache Enabled",
+	"systemsettings.misc.eventPendingLimit": "Event Pending Limit",
+	"systemsettings.misc.workItemsReportingEnabled": "Work Items Reporting Enabled",
+	"systemsettings.misc.workItemsReportingItemsPerSecondEnabled": "Items Per Second Reporting Enabled",
+	"systemsettings.misc.workItemsReportingItemsPerSecondLimit": "Items Per Second Reporting Limit",
+	"systemsettings.misc.threadsNameAdditionalLength": "Thread Name Length",
+	"systemsettings.misc.webResourceUploadsPath": "Uploads Images Path",
+	"systemsettings.misc.webResourceGraphicsPath": "Graphics Images Path",
 	"systemsettings.misc.webResourceUploadsPath.wrong":"Uploaded images save path must end with 'uploads' or 'uploads{0}' ",
 	"systemsettings.misc.webResourceGraphicsPath.wrong": "Graphics images path must end with 'graphics' or 'graphics{0}' ",
 	"systemsettings.top.description": "Top description",
diff --git a/scadalts-ui/src/utils/common.js b/scadalts-ui/src/utils/common.js
index 3d7512e045..a11ee3b118 100644
--- a/scadalts-ui/src/utils/common.js
+++ b/scadalts-ui/src/utils/common.js
@@ -57,6 +57,12 @@ export function getEventList(event, sortByParam, sortDescParam, eventList) {
     }
 }
 
+export function unescapeHtml(value) {
+   let div = document.createElement("div");
+   div.innerHTML = value;
+   return div.textContent || div.innerText;
+}
+
 function comparatorBy(a, b, sortBy, sortDesc) {
    for(let i = 0; i < sortBy.length; i++) {
        let by = sortBy[i];
diff --git a/scadalts-ui/src/views/Alarms/EventList.vue b/scadalts-ui/src/views/Alarms/EventList.vue
index 418790dadf..7671822695 100644
--- a/scadalts-ui/src/views/Alarms/EventList.vue
+++ b/scadalts-ui/src/views/Alarms/EventList.vue
@@ -327,7 +327,7 @@
 						{{ $t(`eventList.sourceType${item.typeId}`) }}
 					</template>
 					<template v-slot:item.message="{ item }">
-						<a :title="(item.message) | clearHtml">{{ (item.message) | clearHtml | truncate}}</a>
+						<a :title="(item.message) | clearHtml"><span v-html="item.message"></span></a>
 					</template>
 
 					<template v-slot:item.status="{ item }">
@@ -621,7 +621,7 @@ export default {
 			return input;
 		},
 		clearHtml(str) {
-			return str.replace(/<[^>]*>?/gm, '').replaceAll('&nbsp;', ' ')
+			return str.replace(/<[^>]*>?/gm, '').replaceAll('&nbsp;', ' ').replaceAll('&#39;', ' ').replaceAll('&quot;', ' ')
 		}
 	},
 	
diff --git a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointComment.vue b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointComment.vue
index ad25c3ae6a..63b4cdf48d 100644
--- a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointComment.vue
+++ b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointComment.vue
@@ -20,10 +20,11 @@
 					</v-list-item-icon>
 					<v-list-item-content>
 						<v-list-item-title>
-							{{ comment.comment }}
+							<span v-html="comment.comment"></span>
 						</v-list-item-title>
 						<v-list-item-subtitle>
-							{{ comment.username }}, {{ new Date(comment.ts).toLocaleString() }}
+							<span v-html="comment.username"></span>,
+							{{ new Date(comment.ts).toLocaleString() }}
 						</v-list-item-subtitle>
 					</v-list-item-content>
 					<v-list-item-action
@@ -87,7 +88,7 @@ export default {
 			this.activeUserId = this.$store.state.loggedUser.id;
 		},
 
-		addComment() {
+		async addComment() {
 			let time = new Date();
 			let comment = {
 				userId: this.$store.state.loggedUser.id,
@@ -96,13 +97,13 @@ export default {
 				username: this.$store.state.loggedUser.username,
 				prettyTime: time.toLocaleTimeString(),
 			};
-			this.data.comments.push(Object.assign({}, comment));
-			this.$store.dispatch('addUserComment', {
+			let response = await this.$store.dispatch('addUserComment', {
 				comment: comment,
 				typeId: 2,
 				refId: this.data.id,
 			});
 			this.newComment = '';
+			this.data.comments.push(Object.assign({}, response));
 		},
 
 		deleteComment(e) {
diff --git a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointEventList.vue b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointEventList.vue
index b289d7e72e..7a0ed12ede 100644
--- a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointEventList.vue
+++ b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointEventList.vue
@@ -120,10 +120,10 @@
 										</v-list-item-icon>
 										<v-list-item-content>
 											<v-list-item-title>
-												{{ comment.comment }}
+												<span v-html="comment.comment"></span>
 											</v-list-item-title>
 											<v-list-item-subtitle>
-												{{ comment.username }},
+												<span v-html="comment.username"></span>,
 												{{ new Date(comment.ts).toLocaleString() }}
 											</v-list-item-subtitle>
 										</v-list-item-content>
@@ -245,7 +245,7 @@ export default {
 			}
 		},
 
-		addComment(e) {
+		async addComment(e) {
 			let time = new Date();
 			let comment = {
 				userId: this.$store.state.loggedUser.id,
@@ -254,13 +254,13 @@ export default {
 				username: this.$store.state.loggedUser.username,
 				prettyTime: time.toLocaleTimeString(),
 			};
-			e.userComments.push(Object.assign({}, comment));
-			this.$store.dispatch('addUserComment', {
+			let response = await this.$store.dispatch('addUserComment', {
 				comment: comment,
 				typeId: 1,
 				refId: e.id,
 			});
 			this.newComment = '';
+			e.userComments.push(Object.assign({}, response));
 		},
 
 		deleteComment(e, comment) {
diff --git a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointValueHistory.vue b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointValueHistory.vue
index 5c6726f52e..072c2fffb0 100644
--- a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointValueHistory.vue
+++ b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointValueHistory.vue
@@ -254,7 +254,6 @@ export default {
 	methods: {
 
 		updatePointWs(data) {
-			console.log("updatePointWs", data);
 			this.pointValue = JSON.parse(data.body).value;
 			this.fetchData();
 		},
diff --git a/scadalts-ui/src/views/DataObjects/DataSources/DataSourceEvents.vue b/scadalts-ui/src/views/DataObjects/DataSources/DataSourceEvents.vue
index ea28a621b3..86d30596ab 100644
--- a/scadalts-ui/src/views/DataObjects/DataSources/DataSourceEvents.vue
+++ b/scadalts-ui/src/views/DataObjects/DataSources/DataSourceEvents.vue
@@ -119,10 +119,10 @@
 											</v-list-item-icon>
 											<v-list-item-content>
 												<v-list-item-title>
-													{{ comment.comment }}
+													<span v-html="comment.comment"></span>
 												</v-list-item-title>
 												<v-list-item-subtitle>
-													{{ comment.username }},
+													<span v-html="comment.username"></span>,
 													{{ new Date(comment.ts).toLocaleString() }}
 												</v-list-item-subtitle>
 											</v-list-item-content>
diff --git a/scadalts-ui/src/views/SynopticPanel/SynopticPanelItem.vue b/scadalts-ui/src/views/SynopticPanel/SynopticPanelItem.vue
index b05d4244b8..5f72ccd4f6 100644
--- a/scadalts-ui/src/views/SynopticPanel/SynopticPanelItem.vue
+++ b/scadalts-ui/src/views/SynopticPanel/SynopticPanelItem.vue
@@ -34,6 +34,7 @@
 <script>
 import customComponentMixin from '../../components/SynopticPanel/CustomComponentMixin.js';
 import SynopticPanelItemEditor from './SynopticPanelItemEditor.vue';
+import {unescapeHtml} from '../../utils/common';
 
 /**
  * Synoptic Panel component - Item
@@ -85,9 +86,10 @@ export default {
 			if (!!dom && !!dom.firstChild) {
 				dom.firstChild.remove();
 			}
+			let vectorImage = unescapeHtml(this.panel.vectorImage);
 			this.$svg('panel-canvas')
 				.size(window.innerWidth, window.innerHeight)
-				.svg(this.panel.vectorImage);
+				.svg(vectorImage);
 			this.$emit('loaded', this.panel.id);
 			this.initSvgComponentData();
 		},
@@ -120,7 +122,8 @@ export default {
 		initSvgComponentData() {
 			try {
 				let graphicItems = this.parseSvgContent();
-				let componentData = new Map(JSON.parse(this.panel.componentData));
+				let unescapeComponentData = unescapeHtml(this.panel.componentData);
+				let componentData = new Map(JSON.parse(unescapeComponentData));
 				if (componentData !== undefined) {
 					for (const [key, value] of componentData.entries()) {
 						graphicItems.set(key, value);
@@ -136,7 +139,8 @@ export default {
 		savePanel(childGraphicItems) {
 			this.graphicItems = childGraphicItems;
 			this.panel.componentData = JSON.stringify([...this.graphicItems]);
-			
+			this.panel.vectorImage = unescapeHtml(this.panel.vectorImage);
+
             this.$store.dispatch('updateSynopticPanel', this.panel).then(() => {
                 this.$emit('updated', true);
             }).catch(() => {
diff --git a/src/br/org/scadabr/vo/exporter/util/FileUtil.java b/src/br/org/scadabr/vo/exporter/util/FileUtil.java
index 5d27bf4ef2..9cbcd37eec 100644
--- a/src/br/org/scadabr/vo/exporter/util/FileUtil.java
+++ b/src/br/org/scadabr/vo/exporter/util/FileUtil.java
@@ -1,5 +1,9 @@
 package br.org.scadabr.vo.exporter.util;
 
+import com.serotonin.mango.util.LoggingUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -7,6 +11,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -15,6 +20,8 @@
 import java.util.zip.ZipOutputStream;
 
 public class FileUtil {
+
+	private static final Log LOG = LogFactory.getLog(FileUtil.class);
 	private static final int BUFFER_SIZE = 2048;
 	private static final String FILE_SEPARATOR = System
 			.getProperty("file.separator");
@@ -22,33 +29,27 @@ public class FileUtil {
 	public static void compactFiles(OutputStream os, FileToPack[] files) {
 		int cont;
 		byte[] data = new byte[BUFFER_SIZE];
-		BufferedInputStream origin = null;
-		FileInputStream inputStream = null;
-		ZipOutputStream output = null;
-		ZipEntry entry = null;
-		try {
-			output = new ZipOutputStream(new BufferedOutputStream(os));
+
+		try (ZipOutputStream output = new ZipOutputStream(new BufferedOutputStream(os))) {
 			for (FileToPack file : files) {
 				if (file.getFile().isFile()) {
-					inputStream = new FileInputStream(file.getFile());
-					origin = new BufferedInputStream(inputStream, BUFFER_SIZE);
-					entry = new ZipEntry(file.getFileNameWhenPacked());
-					try {
-						output.putNextEntry(entry);
-					} catch (Exception e) {
-						continue;
-					}
-					while ((cont = origin.read(data, 0, BUFFER_SIZE)) != -1) {
-						output.write(data, 0, cont);
+					try (FileInputStream inputStream = new FileInputStream(file.getFile());
+						 BufferedInputStream origin = new BufferedInputStream(inputStream, BUFFER_SIZE)) {
+						ZipEntry entry = new ZipEntry(file.getFileNameWhenPacked());
+						try {
+							output.putNextEntry(entry);
+						} catch (Exception e) {
+							continue;
+						}
+						while ((cont = origin.read(data, 0, BUFFER_SIZE)) != -1) {
+							output.write(data, 0, cont);
+						}
 					}
-					origin.close();
 				}
 			}
-			output.close();
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOG.error(LoggingUtils.exceptionInfo(e), e);
 		}
-
 	}
 
 	public static File createTxtTempFile(String text) {
@@ -62,11 +63,18 @@ public static File createTxtTempFile(String text) {
 			file.deleteOnExit();
 			return file;
 		} catch (IOException e) {
-			e.printStackTrace();
+			LOG.error(LoggingUtils.exceptionInfo(e), e);
 		}
 		return file;
 	}
 
+	public static File createSvgTempFile(String xmlContent) throws IOException {
+		File temp = File.createTempFile("" + System.currentTimeMillis(), ".svg");
+		temp.deleteOnExit();
+		Files.writeString(temp.toPath(), xmlContent);
+		return temp;
+	}
+
 	public static List<File> getFilesOnDirectory(Path directoryName) {
 		List<File> files = new ArrayList<>();
 		try {
@@ -87,7 +95,7 @@ public static List<File> getFilesOnDirectory(Path directoryName) {
 				}
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOG.error(LoggingUtils.exceptionInfo(e), e);
 		}
 		return files;
 	}
diff --git a/src/com/serotonin/mango/rt/maint/work/AbstractBeforeAfterWorkItem.java b/src/com/serotonin/mango/rt/maint/work/AbstractBeforeAfterWorkItem.java
index 9bd311d220..afd33d2799 100644
--- a/src/com/serotonin/mango/rt/maint/work/AbstractBeforeAfterWorkItem.java
+++ b/src/com/serotonin/mango/rt/maint/work/AbstractBeforeAfterWorkItem.java
@@ -341,4 +341,18 @@ private static String exceptionsToString(Map<String, Throwable> exceptions) {
     private static boolean isEnabled(SystemSettingsService systemSettingsService) {
         return systemSettingsService.isWorkItemsReportingEnabled();
     }
+
+    @Override
+    public String toString() {
+        return "AbstractBeforeAfterWorkItem{" +
+                "createdDate=" + createdDate +
+                ", success=" + success +
+                ", workFailed=" + workFailed +
+                ", running=" + running +
+                ", threadName=\"" + threadName + '\"' +
+                ", failedMessage=\"" + failedMessage + '\"' +
+                ", startedDate=" + startedDate +
+                ", executedDate=" + executedDate +
+                '}';
+    }
 }
diff --git a/src/com/serotonin/mango/rt/maint/work/WorkItems.java b/src/com/serotonin/mango/rt/maint/work/WorkItems.java
index 052ccf7f83..269caf2781 100644
--- a/src/com/serotonin/mango/rt/maint/work/WorkItems.java
+++ b/src/com/serotonin/mango/rt/maint/work/WorkItems.java
@@ -4,14 +4,12 @@
 import org.scada_lts.quartz.ReadItemsPerSecond;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 class WorkItems implements ReadWorkItems {
 
diff --git a/src/com/serotonin/mango/rt/publish/httpSender/HttpSenderRT.java b/src/com/serotonin/mango/rt/publish/httpSender/HttpSenderRT.java
index 4f085fd5fd..6b5ba1f1a7 100644
--- a/src/com/serotonin/mango/rt/publish/httpSender/HttpSenderRT.java
+++ b/src/com/serotonin/mango/rt/publish/httpSender/HttpSenderRT.java
@@ -18,7 +18,7 @@
  */
 package com.serotonin.mango.rt.publish.httpSender;
 
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.util.*;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -26,8 +26,7 @@
 import org.apache.commons.httpclient.HttpMethodBase;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.*;
 
 import com.serotonin.ShouldNeverHappenException;
 import com.serotonin.db.KeyValuePair;
@@ -47,8 +46,7 @@
 import com.serotonin.util.StringUtils;
 import com.serotonin.web.http.HttpUtils;
 import com.serotonin.web.i18n.LocalizableMessage;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import static com.serotonin.mango.Common.createGetMethod;
 import static com.serotonin.mango.Common.createPostMethod;
@@ -129,15 +127,14 @@ protected void runImpl() {
         @SuppressWarnings("synthetic-access")
         private boolean send(List<PublishQueueEntry<HttpPointVO>> list) {
             // Prepare the message
-            NameValuePair[] params = createNVPs(vo.getStaticParameters(), list, vo.isUseJSON());
+            NameValuePair[] params = createNVPs(vo.getStaticParameters(), list);
 
             HttpMethodBase method;
             if (vo.isUsePost()) {
                 PostMethod post = createPostMethod(vo.getUrl());
-                post.addParameters(params);
                 if (vo.isUseJSON()) {
                     try {
-                        post.setRequestEntity(getJSONRequestEntity(list));
+                        post.setRequestEntity(createRequestEntity(params));
                     } catch (Exception e) {
                         Common.ctx.getEventManager().raiseEvent(sendExceptionEventType, System.currentTimeMillis(), true,
                                 AlarmLevels.URGENT, new LocalizableMessage("common.default", e.getMessage()), createEventContext());
@@ -208,16 +205,12 @@ private boolean send(List<PublishQueueEntry<HttpPointVO>> list) {
         }
     }
 
-    NameValuePair[] createNVPs(List<KeyValuePair> staticParameters, List<PublishQueueEntry<HttpPointVO>> list, boolean useJSON) {
+    NameValuePair[] createNVPs(List<KeyValuePair> staticParameters, List<PublishQueueEntry<HttpPointVO>> list) {
         List<NameValuePair> nvps = new ArrayList<NameValuePair>();
 
         for (KeyValuePair kvp : staticParameters)
             nvps.add(new NameValuePair(kvp.getKey(), kvp.getValue()));
 
-        // Early return if using JSON
-        if (useJSON)
-            return nvps.toArray(new NameValuePair[nvps.size()]);
-
         for (PublishQueueEntry<HttpPointVO> e : list) {
             HttpPointVO pvo = e.getVo();
             PointValueTime pvt = e.getPvt();
@@ -247,48 +240,9 @@ NameValuePair[] createNVPs(List<KeyValuePair> staticParameters, List<PublishQueu
         return nvps.toArray(new NameValuePair[nvps.size()]);
     }
 
-    private Object getJSONPointValue(PointValueTime pvt) {
-        switch (pvt.getValue().getDataType()) {
-            case DataTypes.ALPHANUMERIC:
-                return pvt.getValue().getStringValue();
-            case DataTypes.BINARY:
-                return pvt.getValue().getBooleanValue();
-            case DataTypes.NUMERIC:
-                return pvt.getValue().getDoubleValue();
-            default:
-                throw new ShouldNeverHappenException("Unknown point value time type: " + pvt.getValue().getDataType());
-        }
-    }
-
-    private RequestEntity getJSONRequestEntity(List<PublishQueueEntry<HttpPointVO>> list) throws JsonProcessingException, UnsupportedEncodingException {
-        Map<String,Object> jsonObject = new HashMap<>();
-        for (PublishQueueEntry<HttpPointVO> point : list) {
-            HttpPointVO pvo = point.getVo();
-            PointValueTime pvt = point.getPvt();
-
-            if (pvo.isIncludeTimestamp()) {
-                Map<String,Object> pointJsonObject = new HashMap<>();
-                pointJsonObject.put("value", getJSONPointValue(pvt));
-                switch (vo.getDateFormat()) {
-                    case HttpSenderVO.DATE_FORMAT_BASIC:
-                        pointJsonObject.put("timestamp",HttpDataSourceServlet.BASIC_SDF_CACHE.getObject().format(new Date(pvt.getTime())));
-                        break;
-                    case HttpSenderVO.DATE_FORMAT_TZ:
-                        pointJsonObject.put("timestamp",HttpDataSourceServlet.TZ_SDF_CACHE.getObject().format(new Date(pvt.getTime())));
-                        break;
-                    case HttpSenderVO.DATE_FORMAT_UTC:
-                        pointJsonObject.put("timestamp",Long.toString(pvt.getTime()));
-                        break;
-                    default:
-                        throw new ShouldNeverHappenException("Unknown date format type: " + vo.getDateFormat());
-                }
-                jsonObject.put(pvo.getParameterName(), pointJsonObject);
-            } else {
-                jsonObject.put(pvo.getParameterName(), getJSONPointValue(pvt));
-            }
-        }
-        ObjectMapper jsonMapper = new ObjectMapper();
-        String jsonReq = jsonMapper.writeValueAsString(jsonObject);
+    private RequestEntity createRequestEntity(NameValuePair... result) throws JsonProcessingException, UnsupportedEncodingException {
+        ObjectMapper jsonMapper = ApplicationBeans.getObjectMapper();
+        String jsonReq = jsonMapper.writeValueAsString(result);
         return new StringRequestEntity(jsonReq, "application/json", "utf-8");
     }
 }
diff --git a/src/com/serotonin/mango/view/component/deserializer/CompoundComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/CompoundComponentDeserializer.java
index 0f1f0d143c..b8e095591c 100644
--- a/src/com/serotonin/mango/view/component/deserializer/CompoundComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/CompoundComponentDeserializer.java
@@ -8,6 +8,7 @@
 import com.serotonin.mango.view.component.*;
 import com.serotonin.mango.vo.DataPointVO;
 import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.compound.*;
 
 import java.io.IOException;
@@ -17,7 +18,7 @@
 
 public class CompoundComponentDeserializer extends JsonDeserializer<CompoundComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public CompoundComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/HtmlComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/HtmlComponentDeserializer.java
index cc706cd65c..e87e186ca5 100644
--- a/src/com/serotonin/mango/view/component/deserializer/HtmlComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/HtmlComponentDeserializer.java
@@ -9,13 +9,14 @@
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.databind.*;
 import com.serotonin.mango.view.component.HtmlComponent;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.html.*;
 
 import java.io.IOException;
 
 public class HtmlComponentDeserializer extends JsonDeserializer<HtmlBaseComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public HtmlBaseComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/ImageSetComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/ImageSetComponentDeserializer.java
index c985fa4e1f..bef5202a60 100644
--- a/src/com/serotonin/mango/view/component/deserializer/ImageSetComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/ImageSetComponentDeserializer.java
@@ -7,6 +7,7 @@
 import com.serotonin.mango.view.component.AnalogGraphicComponent;
 import com.serotonin.mango.view.component.BinaryGraphicComponent;
 import com.serotonin.mango.view.component.MultistateGraphicComponent;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.point.imageset.AnalogGraphicComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.imageset.BinaryGraphicComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.imageset.ImageSetComponentDTO;
@@ -16,7 +17,7 @@
 
 public class ImageSetComponentDeserializer extends JsonDeserializer<ImageSetComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public ImageSetComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/ImageStateListDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/ImageStateListDeserializer.java
index 679b59937a..173df11bd7 100644
--- a/src/com/serotonin/mango/view/component/deserializer/ImageStateListDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/ImageStateListDeserializer.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.serotonin.db.IntValuePair;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -15,7 +16,7 @@
 
 public class ImageStateListDeserializer extends JsonDeserializer<List<IntValuePair>> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public List<IntValuePair> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/PointComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/PointComponentDeserializer.java
index 25e9bf91d0..c1f25f8647 100644
--- a/src/com/serotonin/mango/view/component/deserializer/PointComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/PointComponentDeserializer.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.databind.*;
 import com.serotonin.mango.view.component.*;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.point.*;
 import org.scada_lts.web.mvc.api.dto.view.components.point.imageset.ImageSetComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.script.ScriptBaseComponentDTO;
@@ -14,7 +15,7 @@
 
 public class PointComponentDeserializer extends JsonDeserializer<PointComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public PointComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/ScriptBaseComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/ScriptBaseComponentDeserializer.java
index 2dac88e2cb..1e7636aa29 100644
--- a/src/com/serotonin/mango/view/component/deserializer/ScriptBaseComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/ScriptBaseComponentDeserializer.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.databind.*;
 import com.serotonin.mango.view.component.ScriptComponent;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.point.script.ButtonComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.script.ScriptBaseComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.script.ScriptComponentDTO;
@@ -14,7 +15,7 @@
 
 public class ScriptBaseComponentDeserializer extends JsonDeserializer<ScriptBaseComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public ScriptBaseComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/ViewComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/ViewComponentDeserializer.java
index 9bced9db39..f9536d603a 100644
--- a/src/com/serotonin/mango/view/component/deserializer/ViewComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/ViewComponentDeserializer.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.serotonin.mango.view.ImplDefinition;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.GraphicalViewComponentDTO;
 
 import java.io.IOException;
@@ -18,7 +19,7 @@
 
 public class ViewComponentDeserializer extends JsonDeserializer<List<GraphicalViewComponentDTO>> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public List<GraphicalViewComponentDTO> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/vo/mailingList/EmailRecipientDeserializer.java b/src/com/serotonin/mango/vo/mailingList/EmailRecipientDeserializer.java
index 1d1111ba6f..eefc61a6dc 100644
--- a/src/com/serotonin/mango/vo/mailingList/EmailRecipientDeserializer.java
+++ b/src/com/serotonin/mango/vo/mailingList/EmailRecipientDeserializer.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -16,7 +17,7 @@
 
 public class EmailRecipientDeserializer extends JsonDeserializer<List<EmailRecipient>>
 {
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public List<EmailRecipient> deserialize(JsonParser jsonParser, DeserializationContext context) throws IOException, JsonProcessingException
diff --git a/src/com/serotonin/mango/web/dwr/EmportDwr.java b/src/com/serotonin/mango/web/dwr/EmportDwr.java
index 18f2e44356..8e512b01ce 100644
--- a/src/com/serotonin/mango/web/dwr/EmportDwr.java
+++ b/src/com/serotonin/mango/web/dwr/EmportDwr.java
@@ -104,6 +104,8 @@ public String createExportData(int prettyIndent, boolean graphicalViews,
 				scripts, pointValues, maxPointValues, systemSettings,
 				usersProfiles, reports);
 	}
+
+	@Deprecated(since = "2.8.0")
 	public static String exportJSON(String xid){
 		Map<String, Object> data = new LinkedHashMap<String, Object>();
 		DataPointVO dataPoints = new DataPointDao().getDataPointByXid(xid);
@@ -119,6 +121,16 @@ public static String exportJSON(String xid){
 			throw new ShouldNeverHappenException(e);
 		}
 	}
+
+	public static Map<String, Object> exportDataPointBy(String xid) {
+		Map<String, Object> data = new LinkedHashMap<>();
+		DataPointVO dataPoints = new DataPointDao().getDataPointByXid(xid);
+		List<PointEventDetectorVO> detectors = new PointEventDetectorDAO().getPointEventDetectors(dataPoints);
+		dataPoints.setEventDetectors(detectors);
+		data.put(DATA_POINTS, dataPoints == null?"In the database there is no data point with given xid "+xid:dataPoints);
+		return data;
+	}
+
 	public static String createExportJSON(int prettyIndent,
 			boolean graphicalViews, boolean eventHandlers, boolean dataSources,
 			boolean dataPoints, boolean scheduledEvents,
diff --git a/src/org/scada_lts/mango/service/SystemSettingsService.java b/src/org/scada_lts/mango/service/SystemSettingsService.java
index 6baf390796..f52d512819 100644
--- a/src/org/scada_lts/mango/service/SystemSettingsService.java
+++ b/src/org/scada_lts/mango/service/SystemSettingsService.java
@@ -22,6 +22,7 @@
 import org.scada_lts.serorepl.utils.DirectoryUtils;
 import org.scada_lts.serorepl.utils.StringUtils;
 import org.scada_lts.utils.SystemSettingsUtils;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.AggregateSettings;
 import org.scada_lts.web.mvc.api.json.*;
 import org.springframework.stereotype.Service;
@@ -29,6 +30,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.function.Supplier;
 
 import static com.serotonin.mango.util.LoggingUtils.userInfo;
 import static com.serotonin.mango.util.SendUtils.sendMsgTestSync;
@@ -302,6 +304,7 @@ public Map<String, Object> getDatabaseSize() {
         return data;
     }
 
+    @Deprecated(since = "2.8.0")
     public String sendTestEmail(User user) throws Exception {
 
         ResourceBundle bundle = Common.getBundle();
@@ -315,6 +318,20 @@ public String sendTestEmail(User user) throws Exception {
         return "{\"recipient\":\""+user.getEmail()+ "\"}";
     }
 
+    public Map<String, String> sendTestEmailMap(User user) throws Exception {
+
+        ResourceBundle bundle = Common.getBundle();
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("message", new LocalizableMessage("systemSettings.testEmail"));
+        IMsgSubjectContent cnt = IMsgSubjectContent.newInstance(
+                "testEmail", model, bundle, I18NUtils.getMessage(bundle, "ftl.testEmail"), Common.UTF8);
+        sendMsgTestSync(user.getEmail(), cnt, model, () -> "sendTestEmail from: " + this.getClass().getName()
+                + ", " + userInfo(user));
+        Map<String, String> response = new HashMap<>();
+        response.put("recipient", user.getEmail());
+        return response;
+    }
+
     public void purgeAllData() {
         Common.ctx.getRuntimeManager().purgeDataPointValues();
     }
@@ -486,9 +503,9 @@ private static String getHttpResponseHeaders(JsonSettingsHttp json) {
             String httpResponseHeaders = json.getHttpResponseHeaders();
             if(StringUtils.isEmpty(httpResponseHeaders))
                 return "";
-            ObjectMapper objectMapper = new ObjectMapper();
-            Map<String, String> headers = SystemSettingsUtils.deserializeMap(httpResponseHeaders, objectMapper);
-            return serializeMap(headers, objectMapper);
+            Supplier<ObjectMapper> getObjectMapper = () -> ApplicationBeans.getObjectMapper();
+            Map<String, String> headers = SystemSettingsUtils.deserializeMap(httpResponseHeaders, getObjectMapper);
+            return serializeMap(headers, getObjectMapper);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -496,7 +513,7 @@ private static String getHttpResponseHeaders(JsonSettingsHttp json) {
 
     private static Map<String, String> deserializeMap(String json) {
         try {
-            return SystemSettingsUtils.deserializeMap(json, new ObjectMapper());
+            return SystemSettingsUtils.deserializeMap(json, () -> ApplicationBeans.getObjectMapper());
         } catch (Exception e) {
             LOG.warn(e.getMessage(), e);
             return Collections.emptyMap();
diff --git a/src/org/scada_lts/mango/service/UserCommentService.java b/src/org/scada_lts/mango/service/UserCommentService.java
index 5b359e1782..d30ef858cb 100644
--- a/src/org/scada_lts/mango/service/UserCommentService.java
+++ b/src/org/scada_lts/mango/service/UserCommentService.java
@@ -4,6 +4,8 @@
 import com.serotonin.mango.vo.UserComment;
 import org.scada_lts.dao.IUserCommentDAO;
 
+import java.util.Optional;
+
 /**
  * Service for Comments
  *
@@ -26,6 +28,7 @@ public UserCommentService(IUserCommentDAO userCommentDAO) {
      *
      * @return Result status.
      */
+    @Deprecated(since = "2.8.0")
     public int setUserComment(String comment, int typeComment, int referenceId, User user) {
         UserComment c = new UserComment();
         c.setComment(comment);
@@ -48,4 +51,26 @@ public int setUserComment(String comment, int typeComment, int referenceId, User
     public int deleteUserComment(int userId, int typeComment, int referenceId, long timestamp) {
         return userCommentDAO.deleteUserComment(userId, typeComment, referenceId, timestamp);
     }
+
+    /**
+     * Save user comment to database.
+     *
+     * @param comment String
+     * @param typeComment Type of the comment (Event or Point)
+     * @param referenceId Reference ID of the object (EventID or PointID)
+     *
+     * @return Result Optional<UserComment>.
+     */
+    public Optional<UserComment> addUserComment(String comment, int typeComment, int referenceId, User user) {
+        UserComment c = new UserComment();
+        c.setComment(comment);
+        c.setTs(System.currentTimeMillis());
+        c.setUserId(user.getId());
+        c.setUsername(user.getUsername());
+        c.setTypeKey(referenceId);
+        int result = userCommentDAO.insert(c, typeComment, referenceId);
+        if(result == 0)
+            return Optional.empty();
+        return Optional.of(c);
+    }
 }
diff --git a/src/org/scada_lts/permissions/PermissionEvaluatorAclImp.java b/src/org/scada_lts/permissions/PermissionEvaluatorAclImp.java
index 108eaa60de..09d4ee8356 100644
--- a/src/org/scada_lts/permissions/PermissionEvaluatorAclImp.java
+++ b/src/org/scada_lts/permissions/PermissionEvaluatorAclImp.java
@@ -31,6 +31,7 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.scada_lts.permissions.model.EntryDto;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -115,7 +116,7 @@ public List<EntryDto> filter(long userId, long clazzId ) {
             request.setHeader("Content-type", "application/json");
             HttpResponse response = client.execute(request);
 
-            ObjectMapper mapper = new ObjectMapper();
+            ObjectMapper mapper = ApplicationBeans.getObjectMapper();
             result = mapper.readValue(response.getEntity().getContent(), new TypeReference<List<EntryDto>>() {});
 
             HttpEntity entity = response.getEntity();
diff --git a/src/org/scada_lts/service/MultiChangesHistoryService.java b/src/org/scada_lts/service/MultiChangesHistoryService.java
index 014d910a38..891193afaf 100644
--- a/src/org/scada_lts/service/MultiChangesHistoryService.java
+++ b/src/org/scada_lts/service/MultiChangesHistoryService.java
@@ -7,6 +7,7 @@
 import org.scada_lts.dao.model.multichangehistory.MultiChangeHistoryValues;
 import org.scada_lts.service.model.MultiChangeHistoryDTO;
 import org.scada_lts.service.model.ValuesMultiChangesHistoryDTO;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.components.cmp.model.SetValuePointDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,7 +59,7 @@ public Set<MultiChangeHistoryDTO> getHistory(String idViewAndCmpId) {
 
     public void addToCmpHistory(Integer userId, String viewAndCmpId, String interpretedState, SetValuePointDTO[] values) {
 
-        ObjectMapper mapper = new ObjectMapper();
+        ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
         String json;
         try {
diff --git a/src/org/scada_lts/service/UtilsService.java b/src/org/scada_lts/service/UtilsService.java
index f788beef3b..7eb21129d7 100644
--- a/src/org/scada_lts/service/UtilsService.java
+++ b/src/org/scada_lts/service/UtilsService.java
@@ -33,7 +33,7 @@ public class UtilsService {
 	
 	private static final Log LOG = LogFactory.getLog(UtilsService.class);
 	
-	public Long getTS() {
+	public long getTS() {
 		long ts = System.currentTimeMillis();
 		LOG.info("Get timestamp used REST API ts:"+ts);
 		return ts;
diff --git a/src/org/scada_lts/utils/CreateObjectUtils.java b/src/org/scada_lts/utils/CreateObjectUtils.java
index f9d7a45ac7..e3016d9121 100644
--- a/src/org/scada_lts/utils/CreateObjectUtils.java
+++ b/src/org/scada_lts/utils/CreateObjectUtils.java
@@ -5,6 +5,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.serorepl.utils.StringUtils;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.springframework.util.ClassUtils;
 
 import java.util.ArrayList;
@@ -43,7 +44,7 @@ public static Object[] parseObjects(String valuesAsString, String valueTypesAsSt
             return new Object[0];
         }
         List<Object> objects = new ArrayList<>();
-        ObjectMapper objectMapper = new ObjectMapper();
+        ObjectMapper objectMapper = ApplicationBeans.getObjectMapper();
         for(int i=0; i < valueTypes.length; i++) {
             if(StringUtils.isEmpty(values[i]) || StringUtils.isEmpty(valueTypes[i]))
                 continue;
diff --git a/src/org/scada_lts/utils/SystemSettingsUtils.java b/src/org/scada_lts/utils/SystemSettingsUtils.java
index 5ff9aaab6d..c0dab97fff 100644
--- a/src/org/scada_lts/utils/SystemSettingsUtils.java
+++ b/src/org/scada_lts/utils/SystemSettingsUtils.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Supplier;
 
 import static org.scada_lts.config.ThreadPoolExecutorConfig.getKey;
 import static org.scada_lts.utils.CreateObjectUtils.parseObjects;
@@ -102,16 +103,28 @@ public static String getHttpResponseHeaders() {
         }
     }
 
+    @Deprecated(since = "2.8.0")
     public static String serializeMap(Map<String, String> map, ObjectMapper objectMapper) throws JsonProcessingException {
         return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
     }
 
+    public static String serializeMap(Map<String, String> map, Supplier<ObjectMapper> getObjectMapper) throws JsonProcessingException {
+        return getObjectMapper.get().writerWithDefaultPrettyPrinter().writeValueAsString(map);
+    }
+
+    @Deprecated(since = "2.8.0")
     public static Map<String, String> deserializeMap(String value, ObjectMapper objectMapper) throws IOException {
         if(value == null || "null".equals(value))
             return Collections.emptyMap();
         return objectMapper.readValue(value, new TypeReference<HashMap<String, String>>() {});
     }
 
+    public static Map<String, String> deserializeMap(String value, Supplier<ObjectMapper> getObjectMapper) throws IOException {
+        if(value == null || "null".equals(value))
+            return Collections.emptyMap();
+        return getObjectMapper.get().readValue(value, new TypeReference<HashMap<String, String>>() {});
+    }
+
     public static int getEmailTimeout() {
         try {
             return Integer.parseInt(ScadaConfig.getInstance().getConf().getProperty(EMAIL_TIMEOUT_KEY, "10001"));
diff --git a/src/org/scada_lts/utils/ValidationUtils.java b/src/org/scada_lts/utils/ValidationUtils.java
index 9020818eb4..1687a9584a 100644
--- a/src/org/scada_lts/utils/ValidationUtils.java
+++ b/src/org/scada_lts/utils/ValidationUtils.java
@@ -1,18 +1,29 @@
 package org.scada_lts.utils;
 import com.serotonin.mango.Common;
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.vo.User;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.scada_lts.serorepl.utils.StringUtils;
+import org.scada_lts.svg.SvgUtils;
+import org.scada_lts.utils.security.SafeFile;
 import org.scada_lts.web.mvc.api.exceptions.BadRequestException;
 import org.scada_lts.web.mvc.api.exceptions.UnauthorizedException;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.text.MessageFormat;
 import java.util.Objects;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
+import static br.org.scadabr.vo.exporter.util.FileUtil.createSvgTempFile;
+
 public final class ValidationUtils {
 
+    private static final Logger LOG = LogManager.getLogger(SafeFile.class);
+
+
     private ValidationUtils() {}
 
     public static String validId(Integer id) {
@@ -41,6 +52,24 @@ public static String validId(Integer id, String xid) {
         return "Correct id or xid;";
     }
 
+    public static String validSvg(String xmlContent) {
+        SafeFile safeFile = null;
+        try {
+            File temp = createSvgTempFile(xmlContent);
+            safeFile = SafeFile.safe(temp);
+            if (SvgUtils.isSvg(safeFile)) {
+                return "";
+            }
+        } catch (Exception ex) {
+            LOG.error(LoggingUtils.exceptionInfo(ex));
+        } finally {
+            if(safeFile != null) {
+                safeFile.delete();
+            }
+        }
+        return "Invalid image";
+    }
+
     static <T> String msgIfNull(String msg, T value) {
         return msgIfNullOrInvalid(msg, value, a -> false);
     }
diff --git a/src/org/scada_lts/utils/security/SafeFile.java b/src/org/scada_lts/utils/security/SafeFile.java
index fcad6a06ba..3fd0d5799e 100644
--- a/src/org/scada_lts/utils/security/SafeFile.java
+++ b/src/org/scada_lts/utils/security/SafeFile.java
@@ -1,13 +1,22 @@
 package org.scada_lts.utils.security;
 
+import com.serotonin.mango.util.LoggingUtils;
+
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import static org.scada_lts.utils.PathSecureUtils.*;
 
 public class SafeFile {
 
+    private static final Logger LOG = LogManager.getLogger(SafeFile.class);
+
     private final File file;
 
     private SafeFile(File file) {
@@ -35,6 +44,15 @@ public Path toPath() {
         return Path.of("");
     }
 
+    public void delete() {
+        try {
+            Files.delete(file.toPath());
+        } catch (IOException e) {
+            LOG.error(LoggingUtils.exceptionInfo(e));
+        }
+        file.delete();
+    }
+
     private boolean validate() {
         String absolutePath = file.getAbsolutePath();
         String path = file.getPath();
diff --git a/src/org/scada_lts/web/beans/ApplicationBeans.java b/src/org/scada_lts/web/beans/ApplicationBeans.java
index 5c34cc4e98..8fb00b1e84 100644
--- a/src/org/scada_lts/web/beans/ApplicationBeans.java
+++ b/src/org/scada_lts/web/beans/ApplicationBeans.java
@@ -3,6 +3,7 @@
 import br.org.scadabr.vo.permission.ViewAccess;
 import br.org.scadabr.vo.permission.WatchListAccess;
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.view.View;
@@ -20,7 +21,6 @@
 import org.scada_lts.permissions.service.*;
 import org.scada_lts.service.IHighestAlarmLevelService;
 import org.scada_lts.web.ws.services.DataPointServiceWebSocket;
-import org.scada_lts.web.ws.services.EventsServiceWebSocket;
 import org.scada_lts.web.ws.services.UserEventServiceWebSocket;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.ApplicationContext;
@@ -149,6 +149,10 @@ public static ILoggedUsers getLoggedUsersBean() {
         return getBeanFromContext("loggedUsers", ILoggedUsers.class);
     }
 
+    public static ObjectMapper getObjectMapper() {
+        return getBeanFromContext("objectMapper", ObjectMapper.class);
+    }
+
     public static class Lazy {
 
         private Lazy() {}
diff --git a/src/org/scada_lts/web/mvc/api/AuthenticationAPI.java b/src/org/scada_lts/web/mvc/api/AuthenticationAPI.java
index 951d57dc61..3266686c00 100644
--- a/src/org/scada_lts/web/mvc/api/AuthenticationAPI.java
+++ b/src/org/scada_lts/web/mvc/api/AuthenticationAPI.java
@@ -17,8 +17,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 
@@ -37,11 +35,12 @@ public class AuthenticationAPI {
 	
 	private static final Log LOG = LogFactory.getLog(AuthenticationAPI.class);
 	
-	private final UserService userService = new UserService();
+	private final UserService userService;
 
 	private final AuthenticationManager authenticationManager;
 
-	public AuthenticationAPI(AuthenticationManager authenticationManager) {
+	public AuthenticationAPI(UserService userService, AuthenticationManager authenticationManager) {
+		this.userService = userService;
 		this.authenticationManager = authenticationManager;
 	}
 	
@@ -72,16 +71,7 @@ public ResponseEntity<String> checkIsLogged(@PathVariable("username") String use
 		} else {
 			ok = false;
 		}
-		
-		ObjectMapper mapper = new ObjectMapper();
-		String json = null;
-		try {
-			json = mapper.writeValueAsString(ok);
-		} catch (JsonProcessingException e) {
-			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-		}
-		return new ResponseEntity<String>(json,HttpStatus.OK);
+		return new ResponseEntity<>(String.valueOf(ok),HttpStatus.OK);
 	}
 	
 	@RequestMapping(value = "/api/auth/logout/{username}", method = RequestMethod.GET)
@@ -93,15 +83,7 @@ public ResponseEntity<String> setLogout(@PathVariable("username") String usernam
 			logout(request);
 		}
 
-		ObjectMapper mapper = new ObjectMapper();
-		String json = null;
-		try {
-			json = mapper.writeValueAsString(true);
-		} catch (JsonProcessingException e) {
-			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-		}
-		return new ResponseEntity<String>(json, HttpStatus.OK);
+		return new ResponseEntity<>(String.valueOf(true),HttpStatus.OK);
 	}
 
 	@RequestMapping(value = "/api/auth/isRoleAdmin", method = RequestMethod.GET)
@@ -111,15 +93,7 @@ public ResponseEntity<String> isRoleAdmin(HttpServletRequest request) {
 		User user = Common.getUser(request);
 		
 		if (user != null) {
-			ObjectMapper mapper = new ObjectMapper();
-			String json = null;
-			try {
-				json = mapper.writeValueAsString(user.isAdmin());
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-			}
-			return new ResponseEntity<String>(json,HttpStatus.OK);
+			return new ResponseEntity<>(String.valueOf(user.isAdmin()),HttpStatus.OK);
 		}
 		
 		return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
@@ -133,15 +107,7 @@ public ResponseEntity<String> isRoleUser(HttpServletRequest request) {
 		User user = Common.getUser(request);
 		
 		if (user != null) {
-			ObjectMapper mapper = new ObjectMapper();
-			String json = null;
-			try {
-				json = mapper.writeValueAsString(!user.isAdmin());
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-			}
-			return new ResponseEntity<String>(json,HttpStatus.OK);
+			return new ResponseEntity<>(String.valueOf(!user.isAdmin()),HttpStatus.OK);
 		}
 		
 		return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
diff --git a/src/org/scada_lts/web/mvc/api/ConfigAPI.java b/src/org/scada_lts/web/mvc/api/ConfigAPI.java
index 39e488e41a..4ed61bb810 100644
--- a/src/org/scada_lts/web/mvc/api/ConfigAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ConfigAPI.java
@@ -1,7 +1,5 @@
 package org.scada_lts.web.mvc.api;
 
-import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
@@ -10,12 +8,9 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 
@@ -37,22 +32,16 @@ public ResponseEntity<String> getConfig(HttpServletRequest request) {
 		User user = Common.getUser(request);
 		
 		if (user != null) {
-			ObjectMapper mapper = new ObjectMapper();
-			String json = null;
 			try {
 				boolean disableAlert = ScadaConfig.getInstance().getBoolean(ScadaConfig.REPLACE_ALERT_ON_VIEW, false);
-				json = mapper.writeValueAsString(disableAlert);	
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-			} catch (IOException e) {
+				return new ResponseEntity<>(String.valueOf(disableAlert),HttpStatus.OK);
+			} catch (Exception e) {
 				LOG.error(e);
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
-			return new ResponseEntity<String>(json,HttpStatus.OK);
 		}
 		
-		return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+		return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 	}
 	
diff --git a/src/org/scada_lts/web/mvc/api/CustomCssAPI.java b/src/org/scada_lts/web/mvc/api/CustomCssAPI.java
index b60854d896..0fa9823069 100644
--- a/src/org/scada_lts/web/mvc/api/CustomCssAPI.java
+++ b/src/org/scada_lts/web/mvc/api/CustomCssAPI.java
@@ -3,6 +3,7 @@
 import com.serotonin.mango.Common;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scada_lts.web.mvc.api.css.CssStyle;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -13,6 +14,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
+import java.nio.file.Files;
 
 @Controller
 @RequestMapping("/api/customcss")
@@ -24,19 +26,13 @@ public class CustomCssAPI {
     private static final String REQ_RESP_ERROR = "Couldn't create a *.css file.";
 
     @GetMapping("/")
-    public ResponseEntity<String> getCustomCssFile(HttpServletRequest request) {
+    public ResponseEntity<?> getCustomCssFile(HttpServletRequest request) {
         LOG.info("GET: /api/customcss");
         try {
-            StringBuilder customCssContent = new StringBuilder();
             File cssFile = getCustomCssFileFromPath();
-
             if(cssFile != null) {
-                BufferedReader reader = new BufferedReader(new FileReader(cssFile.getAbsolutePath()));
-                String currentLine;
-                while ((currentLine = reader.readLine()) != null) {
-                    customCssContent.append(currentLine).append("\n");
-                }
-                return new ResponseEntity<>(customCssContent.toString(), HttpStatus.OK);
+                String content = Files.readString(cssFile.toPath());
+                return new ResponseEntity<>(new CssStyle(content), HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(REQ_RESP_ERROR,HttpStatus.INTERNAL_SERVER_ERROR);
             }
@@ -52,9 +48,9 @@ public ResponseEntity<String> saveCustomCssFile(HttpServletRequest request, @Req
         try {
             File cssFile = getCustomCssFileFromPath();
             if(cssFile != null) {
-                BufferedWriter writer = new BufferedWriter(new FileWriter(cssFile.getAbsolutePath()));
-                writer.write(fileContent);
-                writer.close();
+                try (BufferedWriter writer = new BufferedWriter(new FileWriter(cssFile.getAbsolutePath()))) {
+                    writer.write(fileContent);
+                }
                 return new ResponseEntity<>(HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(REQ_RESP_ERROR, HttpStatus.INTERNAL_SERVER_ERROR);
diff --git a/src/org/scada_lts/web/mvc/api/DataPointAPI.java b/src/org/scada_lts/web/mvc/api/DataPointAPI.java
index b027e57e1d..29777085a0 100644
--- a/src/org/scada_lts/web/mvc/api/DataPointAPI.java
+++ b/src/org/scada_lts/web/mvc/api/DataPointAPI.java
@@ -138,11 +138,11 @@ public ResponseEntity<List<DataPointIdentifier>> searchDataPointIdentifiers(@Req
     }
 
     @GetMapping(value = "/api/datapoint/getConfigurationByXid/{xid}")
-    public ResponseEntity<String> getConfigurationByXid(@PathVariable(required = false) String xid,
+    public ResponseEntity<Map<String, Object>> getConfigurationByXid(@PathVariable(required = false) String xid,
                                                         HttpServletRequest request) {
         LOG.debug(request.getRequestURI());
 
-        String response = dataPointApiService.getConfigurationByXid(request, xid);
+        Map<String, Object>  response = dataPointApiService.getDataPointByXid(request, xid);
         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 2a275ac335..9a591084ca 100644
--- a/src/org/scada_lts/web/mvc/api/DataPointApiService.java
+++ b/src/org/scada_lts/web/mvc/api/DataPointApiService.java
@@ -154,6 +154,7 @@ public List<DataPointIdentifier> getIdentifiers(HttpServletRequest request) {
         return response;
     }
 
+    @Deprecated(since = "2.8.0")
     public String getConfigurationByXid(HttpServletRequest request, String xid) {
         checkIfNonAdminThenUnauthorized(request);
         if(StringUtils.isEmpty(xid)) {
@@ -172,6 +173,17 @@ public String getConfigurationByXid(HttpServletRequest request, String xid) {
         return response;
     }
 
+    public Map<String, Object> getDataPointByXid(HttpServletRequest request, String xid) {
+        checkIfNonAdminThenUnauthorized(request);
+        if(StringUtils.isEmpty(xid)) {
+            throw new ScadaApiException(ScadaErrorMessage.builder(HttpStatus.OK)
+                    .detail("Given xid is empty.")
+                    .instance(request.getRequestURI())
+                    .build());
+        }
+        return EmportDwr.exportDataPointBy(xid);
+    }
+
     public DataPointVO getDataPointFromDatabase(HttpServletRequest request, String xid, Integer id) {
         checkArgsIfTwoEmptyThenBadRequest(request, "Data Point id or xid cannot be null.", id, xid);
         User user = Common.getUser(request);
diff --git a/src/org/scada_lts/web/mvc/api/EventDetectorAPI.java b/src/org/scada_lts/web/mvc/api/EventDetectorAPI.java
index b83ac6aa5d..e80655d8c3 100644
--- a/src/org/scada_lts/web/mvc/api/EventDetectorAPI.java
+++ b/src/org/scada_lts/web/mvc/api/EventDetectorAPI.java
@@ -1,7 +1,5 @@
 package org.scada_lts.web.mvc.api;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
@@ -17,7 +15,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
@@ -38,8 +35,11 @@ public class EventDetectorAPI {
 
     private static final Log LOG = LogFactory.getLog(EventDetectorAPI.class);
 
-    @Resource
-    private DataPointService dataPointService;
+    private final DataPointService dataPointService;
+
+    public EventDetectorAPI(DataPointService dataPointService) {
+        this.dataPointService = dataPointService;
+    }
 
     @GetMapping(value = "/getAll/id/{datapointId}", produces = "application/json")
     public ResponseEntity<List<PointEventDetectorVO>> getEventDetectorsById(@PathVariable int datapointId, HttpServletRequest request) {
@@ -82,7 +82,7 @@ public ResponseEntity<String> updateEventDetector(@PathVariable Integer datapoin
     }
 
     @DeleteMapping(value = "/delete/{datapointId}/{id}", produces = "application/json")
-    public ResponseEntity<String> deleteEventDetectorById(@PathVariable int datapointId, @PathVariable int id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> deleteEventDetectorById(@PathVariable int datapointId, @PathVariable int id, HttpServletRequest request) {
         LOG.info("/api/eventDetector/delete/" + datapointId + "/" + id);
         try {
             User user = Common.getUser(request);
@@ -97,14 +97,7 @@ public ResponseEntity<String> deleteEventDetectorById(@PathVariable int datapoin
                 Common.ctx.getRuntimeManager().saveDataPoint(dataPointVO);
                 Map<String, String> response = new HashMap<>();
                 response.put("status", "deleted");
-                ObjectMapper m = new ObjectMapper();
-                try {
-                    String json = m.writeValueAsString(response);
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.FORBIDDEN);
-                }
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
diff --git a/src/org/scada_lts/web/mvc/api/EventHandlerAPI.java b/src/org/scada_lts/web/mvc/api/EventHandlerAPI.java
index e3e975f9a8..d7ac98ab38 100644
--- a/src/org/scada_lts/web/mvc/api/EventHandlerAPI.java
+++ b/src/org/scada_lts/web/mvc/api/EventHandlerAPI.java
@@ -1,7 +1,5 @@
 package org.scada_lts.web.mvc.api;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.event.EventHandlerVO;
@@ -15,7 +13,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
@@ -27,8 +24,11 @@ public class EventHandlerAPI {
 
     private static final Log LOG = LogFactory.getLog(EventHandlerAPI.class);
 
-    @Resource
-    private EventService eventHandlerService;
+    private final EventService eventHandlerService;
+
+    public EventHandlerAPI(EventService eventHandlerService) {
+        this.eventHandlerService = eventHandlerService;
+    }
 
     @GetMapping(value = "/getAll", produces = "application/json")
     public ResponseEntity<List<EventHandlerVO>> getAllEventHandlers(HttpServletRequest request) {
@@ -152,17 +152,20 @@ public ResponseEntity<EventHandlerVO> createEventHandlerTypeSms(@PathVariable("t
     }
 
     @PutMapping(value = "/update/{typeId}/{typeRef1}/{typeRef2}", consumes = "application/json")
-    public ResponseEntity<String> updateEventHandler(@PathVariable("typeId") int typeId, @PathVariable("typeRef1") int typeRef1, @PathVariable("typeRef2") int typeRef2, @RequestBody EventHandlerVO handler, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> updateEventHandler(@PathVariable("typeId") int typeId, @PathVariable("typeRef1") int typeRef1, @PathVariable("typeRef2") int typeRef2, @RequestBody EventHandlerVO handler, HttpServletRequest request) {
         LOG.info("/api/eventHandler/update/...");
         try {
             User user = Common.getUser(request);
             if (user != null) {
+                Map<String, String> response = new HashMap<>();
                 try {
                     EventTypeVO typeVO = new EventTypeVO(typeId, typeRef1, typeRef2);
                     eventHandlerService.saveEventHandler(typeVO, handler);
-                    return new ResponseEntity<>("{\"status\":\"updated\"}", HttpStatus.OK);
+                    response.put("status", "updated");
+                    return new ResponseEntity<>(response, HttpStatus.OK);
                 } catch (NullPointerException ex) {
-                    return new ResponseEntity<>("{\"status\":\"warning\"}", HttpStatus.OK);
+                    response.put("status", "warning");
+                    return new ResponseEntity<>(response, HttpStatus.OK);
                 }
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -174,7 +177,7 @@ public ResponseEntity<String> updateEventHandler(@PathVariable("typeId") int typ
     }
 
     @DeleteMapping(value = "/delete/{xid}", produces = "application/json")
-    public ResponseEntity<String> deleteEventHandlerByXid(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> deleteEventHandlerByXid(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/eventHandler/delete/" + xid);
         try {
             User user = Common.getUser(request);
@@ -182,14 +185,7 @@ public ResponseEntity<String> deleteEventHandlerByXid(@PathVariable("xid") Strin
                 eventHandlerService.deleteEventHandler(xid);
                 Map<String, String> response = new HashMap<>();
                 response.put("status", "deleted");
-                ObjectMapper m = new ObjectMapper();
-                try {
-                    String json = m.writeValueAsString(response);
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.FORBIDDEN);
-                }
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -200,7 +196,7 @@ public ResponseEntity<String> deleteEventHandlerByXid(@PathVariable("xid") Strin
     }
 
     @DeleteMapping(value = "/delete/id/{id}", produces = "application/json")
-    public ResponseEntity<String> deleteEventHandlerById(@PathVariable("id") int id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> deleteEventHandlerById(@PathVariable("id") int id, HttpServletRequest request) {
         LOG.info("/api/eventHandler/delete/id/" + id);
         try {
             User user = Common.getUser(request);
@@ -208,14 +204,7 @@ public ResponseEntity<String> deleteEventHandlerById(@PathVariable("id") int id,
                 eventHandlerService.deleteEventHandler(id);
                 Map<String, String> response = new HashMap<>();
                 response.put("status", "deleted");
-                ObjectMapper m = new ObjectMapper();
-                try {
-                    String json = m.writeValueAsString(response);
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.FORBIDDEN);
-                }
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
diff --git a/src/org/scada_lts/web/mvc/api/EventsAPI.java b/src/org/scada_lts/web/mvc/api/EventsAPI.java
index dd77a00cf6..0e03f14e0f 100644
--- a/src/org/scada_lts/web/mvc/api/EventsAPI.java
+++ b/src/org/scada_lts/web/mvc/api/EventsAPI.java
@@ -299,7 +299,6 @@ public ResponseEntity<String> unsilenceSelectedEvents(@RequestBody JsonIdSelecti
         try {
             User user = Common.getUser(request);
             if (user != null) {
-                Date time = new Date();
                 List <Integer> ids = new ArrayList<Integer>();
                 for (String id: query.getIds().split(",")) {
                     ids.add(Integer.parseInt(id.trim()));
diff --git a/src/org/scada_lts/web/mvc/api/MailingListAPI.java b/src/org/scada_lts/web/mvc/api/MailingListAPI.java
index 14d4e3a204..17dbb53f79 100644
--- a/src/org/scada_lts/web/mvc/api/MailingListAPI.java
+++ b/src/org/scada_lts/web/mvc/api/MailingListAPI.java
@@ -17,11 +17,12 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.scada_lts.utils.ApiUtils.*;
 import static org.scada_lts.utils.MailingListApiUtils.*;
-import static org.scada_lts.utils.ValidationUtils.formatErrorsJson;
 
 /**
  * Controller for MailingList
@@ -126,23 +127,28 @@ public ResponseEntity<String> generateUniqueXid(HttpServletRequest request) {
     }
 
     @PostMapping(value = "/", produces = "application/json")
-    public ResponseEntity<String> createMailingList(@RequestBody CreateMailingList mailingList, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> createMailingList(@RequestBody CreateMailingList mailingList, HttpServletRequest request) {
         LOG.info("POST:/api/mailingList");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateMailingListCreate(mailingList);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 if (isMailingListPresent(mailingList.getXid(), mailingListService)) {
-                    return new ResponseEntity<>(formatErrorsJson("This XID is already in use"), HttpStatus.BAD_REQUEST);
+                    response.put("errors", "This XID is already in use");
+                    return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
                 }
                 if (!usersExist(mailingList.getEntries(), userService)) {
-                    return new ResponseEntity<>(formatErrorsJson("user or users not found"), HttpStatus.NOT_FOUND);
+                    response.put("errors", "user or users not found");
+                    return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
                 }
                 mailingListService.saveMailingList(createMailingListFromBody(mailingList));
-                return new ResponseEntity<>("{\"status\":\"created\"}", HttpStatus.CREATED);
+                response.put("status", "created");
+                return new ResponseEntity<>(response, HttpStatus.CREATED);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -152,14 +158,16 @@ public ResponseEntity<String> createMailingList(@RequestBody CreateMailingList m
     }
 
     @PutMapping(value = "/", produces = "application/json")
-    public ResponseEntity<String> updateMailingList(@RequestBody UpdateMailingList mailingList, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> updateMailingList(@RequestBody UpdateMailingList mailingList, HttpServletRequest request) {
         LOG.info("PUT:/api/mailingList");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateMailingListUpdate(mailingList);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 return findAndUpdateMailingList(mailingList);
             } else {
@@ -171,17 +179,20 @@ public ResponseEntity<String> updateMailingList(@RequestBody UpdateMailingList m
     }
 
     @DeleteMapping(value = "/{id}", produces = "application/json")
-    public ResponseEntity<String> deleteMailingListById(@PathVariable Integer id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> deleteMailingListById(@PathVariable Integer id, HttpServletRequest request) {
         LOG.info("DELETE: /api/mailingList/{id}");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateMailingListDelete(id);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 mailingListService.deleteMailingList(id);
-                return new ResponseEntity<>("{\"status\":\"deleted\"}", HttpStatus.OK);
+                response.put("status", "deleted");
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -190,22 +201,28 @@ public ResponseEntity<String> deleteMailingListById(@PathVariable Integer id, Ht
         }
     }
 
-    private ResponseEntity<String> findAndUpdateMailingList(UpdateMailingList mailingListBody) {
+    private ResponseEntity<Map<String, String>> findAndUpdateMailingList(UpdateMailingList mailingListBody) {
+        Map<String, String> errors = new HashMap<>();
+        errors.put("errors", "mailingList not found");
         return getMailingList(mailingListBody.getId(), mailingListService)
                 .map(toUpdate -> updateMailingList(toUpdate, mailingListBody)).
-                        orElse(new ResponseEntity<>(formatErrorsJson("mailingList not found"), HttpStatus.NOT_FOUND));
+                        orElse(new ResponseEntity<>(errors, HttpStatus.NOT_FOUND));
     }
 
-    private ResponseEntity<String> updateMailingList(MailingList toUpdate, UpdateMailingList mailingListBody) {
+    private ResponseEntity<Map<String, String>> updateMailingList(MailingList toUpdate, UpdateMailingList mailingListBody) {
+        Map<String, String> response = new HashMap<>();
         if (mailingListBody.getEntries() != null && !usersExist(mailingListBody.getEntries(), userService)) {
-            return new ResponseEntity<>(formatErrorsJson("user or users not found"), HttpStatus.NOT_FOUND);
+            response.put("errors", "user or users not found");
+            return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
         }
         if (isXidChanged(toUpdate.getXid(), mailingListBody.getXid()) &&
-                isMailingListPresent(mailingListBody.getXid(), mailingListService)){
-            return new ResponseEntity<>(formatErrorsJson("This XID is already in use"), HttpStatus.BAD_REQUEST);
+                isMailingListPresent(mailingListBody.getXid(), mailingListService)) {
+            response.put("errors", "This XID is already in use");
+            return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
         }
         updateValueMailingList(toUpdate, mailingListBody);
         mailingListService.saveMailingList(toUpdate);
-        return new ResponseEntity<>("{\"status\":\"updated\"}", HttpStatus.OK);
+        response.put("status", "updated");
+        return new ResponseEntity<>(response, HttpStatus.OK);
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/PointHierarchyAPI.java b/src/org/scada_lts/web/mvc/api/PointHierarchyAPI.java
index 3f250e240a..135d8c2194 100644
--- a/src/org/scada_lts/web/mvc/api/PointHierarchyAPI.java
+++ b/src/org/scada_lts/web/mvc/api/PointHierarchyAPI.java
@@ -32,7 +32,9 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Create by at Grzesiek Bylica
@@ -217,20 +219,21 @@ public ResponseEntity<String> deleteFolder(
     }
 
     @RequestMapping(value = "/api/pointHierarchy/cacheRefresh", method = RequestMethod.POST)
-    public ResponseEntity<String> cacheRefresh(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> cacheRefresh(HttpServletRequest request) {
         LOG.info("/api/pointHierarchy/cacheRefresh");
-        ResponseEntity<String> result = null;
+        ResponseEntity<Map<String, String>> result = null;
+        Map<String, String> empty = new HashMap<>();
         try {
             User user = Common.getUser(request);
             if (user.isAdmin()) {
                 pointHierarchyXidService.cacheRefresh();
-                result = new ResponseEntity<>("{}", HttpStatus.OK);
+                result = new ResponseEntity<>(empty, HttpStatus.OK);
             } else {
-                result = new ResponseEntity<>("{}", HttpStatus.UNAUTHORIZED);
+                result = new ResponseEntity<>(empty, HttpStatus.UNAUTHORIZED);
             }
         } catch (Exception e) {
             LOG.error(e);
-            result = new ResponseEntity<>("{}", HttpStatus.BAD_REQUEST);
+            result = new ResponseEntity<>(empty, HttpStatus.BAD_REQUEST);
         }
         return result;
     }
diff --git a/src/org/scada_lts/web/mvc/api/PointPropertiesAPI.java b/src/org/scada_lts/web/mvc/api/PointPropertiesAPI.java
index 917f73c0c2..2bb381c886 100644
--- a/src/org/scada_lts/web/mvc/api/PointPropertiesAPI.java
+++ b/src/org/scada_lts/web/mvc/api/PointPropertiesAPI.java
@@ -2,10 +2,10 @@
 
 import java.io.Serializable;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.serotonin.mango.rt.RuntimeManager;
 import com.serotonin.mango.rt.dataImage.DataPointRT;
 import com.serotonin.mango.view.ImplDefinition;
@@ -20,7 +20,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.view.chart.ChartRenderer;
 import com.serotonin.mango.view.text.TextRenderer;
@@ -28,7 +27,6 @@
 import com.serotonin.mango.vo.User;
 
 import static org.scada_lts.utils.PointPropertiesApiUtils.*;
-import static org.scada_lts.utils.ValidationUtils.formatErrorsJson;
 import static org.scada_lts.utils.ValidationUtils.validId;
 
 /**
@@ -49,12 +47,16 @@ public class PointPropertiesAPI {
 
     private static final Log LOG = LogFactory.getLog(PointPropertiesAPI.class);
 
-    private DataPointService dataPointService = new DataPointService();
+    private final DataPointService dataPointService;
 
     private static final String SAVED_MSG = "saved";
 
+    public PointPropertiesAPI(DataPointService dataPointService) {
+        this.dataPointService = dataPointService;
+    }
+
     @RequestMapping(value = "/getPropertiesBaseOnId/{id}", method = RequestMethod.GET)
-    public ResponseEntity<String> getPropertiesBaseOnId(@PathVariable("id") int id, HttpServletRequest request) {
+    public ResponseEntity<PropertiesPointToJSON> getPropertiesBaseOnId(@PathVariable("id") int id, HttpServletRequest request) {
         LOG.info("/api/point_properties/getPropertiesBaseOnId/{id} id:" + id);
 
         try {
@@ -63,253 +65,6 @@ public ResponseEntity<String> getPropertiesBaseOnId(@PathVariable("id") int id,
             if (user != null) {
                 DataPointVO dpvo = dataPointService.getDataPoint(id);
 
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
-                ResourceBundle bundle = Common.getBundle(request);
-
-                class PropertiesPointToJSON implements Serializable {
-
-                    private static final long serialVersionUID = 1L;
-
-                    private String description;
-                    private int loggingType;
-                    private int intervalLoggingPeriod;
-                    private int intervalLoggingPeriodType;
-                    private int intervalLoggingType;
-                    private int purgeType;
-                    private int purgePeriod;
-                    private int defaultCacheSize;
-                    private String typeKey;
-                    private TextRenderer textRenderer;
-                    private EventTextRenderer eventTextRenderer;
-                    private ImplDefinition def;
-                    private ChartRenderer chartRenderer;
-                    private int engineeringUnits;
-                    private double tolerance;
-                    private boolean isDiscardExtremeValues;
-                    private double discardLowLimit;
-                    private double discardHighLimit;
-                    private int dataTypeId;
-                    private int purgeStrategy;
-                    private int purgeValuesLimit;
-
-
-                    public PropertiesPointToJSON(
-                            String description,
-                            int loggingType,
-                            int intervalLoggingPeriod,
-                            int intervalLoggingPeriodType,
-                            int purgeType,
-                            int purgePeriod,
-                            int defaultCacheSize,
-                            String typeKey,
-                            TextRenderer textRenderer,
-                            EventTextRenderer eventTextRenderer,
-                            ImplDefinition def,
-                            ChartRenderer chartRenderer,
-                            int engineeringUnits,
-                            double tolerance,
-                            int intervalLoggingType,
-                            boolean isDiscardExtremeValues,
-                            double discardLowLimit,
-                            double discardHighLimit,
-                            int dataTypeId,
-                            int purgeStrategy,
-                            int purgeValuesLimit
-                    ) {
-                        this.description = description;
-                        this.loggingType = loggingType;
-                        this.intervalLoggingPeriod = intervalLoggingPeriod;
-                        this.intervalLoggingPeriodType = intervalLoggingPeriodType;
-                        this.purgeType = purgeType;
-                        this.purgePeriod =  purgePeriod;
-                        this.defaultCacheSize = defaultCacheSize;
-                        this.typeKey = typeKey;
-                        this.textRenderer = textRenderer;
-                        this.eventTextRenderer = eventTextRenderer;
-                        this.def = def;
-                        this.chartRenderer = chartRenderer;
-                        this.engineeringUnits = engineeringUnits;
-                        this.tolerance = tolerance;
-                        this.intervalLoggingType = intervalLoggingType;
-                        this.isDiscardExtremeValues = isDiscardExtremeValues;
-                        this.discardLowLimit = discardLowLimit;
-                        this.discardHighLimit = discardHighLimit;
-                        this.dataTypeId = dataTypeId;
-                        this.purgeStrategy = purgeStrategy;
-                        this.purgeValuesLimit = purgeValuesLimit;
-                    }
-
-                    public String getDescription() {
-                        return description;
-                    }
-
-                    public void setDescription(String description) {
-                        this.description = description;
-                    }
-
-                    public int getLoggingType() {
-                        return loggingType;
-                    }
-
-                    public void setLoggingType(int loggingType) {
-                        this.loggingType = loggingType;
-                    }
-
-                    public int getIntervalLoggingPeriod() {
-                        return intervalLoggingPeriod;
-                    }
-
-                    public void setIntervalLoggingPeriod(int intervalLoggingPeriod) {
-                        this.intervalLoggingPeriod = intervalLoggingPeriod;
-                    }
-
-                    public int getIntervalLoggingPeriodType() {
-                        return intervalLoggingPeriodType;
-                    }
-
-                    public void setIntervalLoggingPeriodType(int intervalLoggingPeriodType) {
-                        this.intervalLoggingPeriodType = intervalLoggingPeriodType;
-                    }
-
-                    public int getPurgeType() {
-                        return purgeType;
-                    }
-
-                    public void setPurgeType(int purgeType) {
-                        this.purgeType = purgeType;
-                    }
-
-                    public int getDefaultCacheSize() {
-                        return defaultCacheSize;
-                    }
-
-                    public void setDefaultCacheSize(int defaultCacheSize) {
-                        this.defaultCacheSize = defaultCacheSize;
-                    }
-
-                    public String getTypeKey() {
-                        return typeKey;
-                    }
-
-                    public void setTypeKey(String typeKey) {
-                        this.typeKey = typeKey;
-                    }
-
-                    public TextRenderer getTextRenderer() {
-                        return textRenderer;
-                    }
-
-                    public void setTextRenderer(TextRenderer textRenderer) {
-                        this.textRenderer = textRenderer;
-                    }
-
-                    public EventTextRenderer getEventTextRenderer() {
-                        return eventTextRenderer;
-                    }
-
-                    public void setEventTextRenderer(EventTextRenderer eventTextRenderer) {
-                        this.eventTextRenderer = eventTextRenderer;
-                    }
-
-                    public ImplDefinition getDef() {
-                        return def;
-                    }
-
-                    public void setDef(ImplDefinition def) {
-                        this.def = def;
-                    }
-
-                    public ChartRenderer getChartRenderer() {
-                        return chartRenderer;
-                    }
-
-                    public void setChartRenderer(ChartRenderer chartRenderer) {
-                        this.chartRenderer = chartRenderer;
-                    }
-
-                    public int getEngineeringUnits() {
-                        return engineeringUnits;
-                    }
-
-                    public void setEngineeringUnits(int engineeringUnits) {
-                        this.engineeringUnits = engineeringUnits;
-                    }
-
-                    public double getTolerance() {
-                        return tolerance;
-                    }
-
-                    public void setTolerance(double tolerance) {
-                        this.tolerance = tolerance;
-                    }
-
-                    public int getIntervalLoggingType() {
-                        return intervalLoggingType;
-                    }
-
-                    public void setIntervalLoggingType(int intervalLoggingType) {
-                        this.intervalLoggingType = intervalLoggingType;
-                    }
-
-                    public boolean isDiscardExtremeValues() {
-                        return isDiscardExtremeValues;
-                    }
-
-                    public void setDiscardExtremeValues(boolean discardExtremeValues) {
-                        isDiscardExtremeValues = discardExtremeValues;
-                    }
-
-                    public double getDiscardLowLimit() {
-                        return discardLowLimit;
-                    }
-
-                    public void setDiscardLowLimit(double discardLowLimit) {
-                        this.discardLowLimit = discardLowLimit;
-                    }
-
-                    public double getDiscardHighLimit() {
-                        return discardHighLimit;
-                    }
-
-                    public void setDiscardHighLimit(double discardHighLimit) {
-                        this.discardHighLimit = discardHighLimit;
-                    }
-
-                    public int getPurgePeriod() {
-                        return purgePeriod;
-                    }
-
-                    public void setPurgePeriod(int purgePeriod) {
-                        this.purgePeriod = purgePeriod;
-                    }
-
-                    public int getDataTypeId() {
-                        return dataTypeId;
-                    }
-
-                    public void setDataTypeId(int dataTypeId) {
-                        this.dataTypeId = dataTypeId;
-                    }
-
-                    public int getPurgeStrategy() {
-                        return purgeStrategy;
-                    }
-
-                    public void setPurgeStrategy(int purgeStrategy) {
-                        this.purgeStrategy = purgeStrategy;
-                    }
-
-                    public int getPurgeValuesLimit() {
-                        return purgeValuesLimit;
-                    }
-
-                    public void setPurgeValuesLimit(int purgeValuesLimit) {
-                        this.purgeValuesLimit = purgeValuesLimit;
-                    }
-                }
-
                 PropertiesPointToJSON p = new PropertiesPointToJSON(
                         dpvo.getDescription(),
                         dpvo.getLoggingType(),
@@ -334,22 +89,20 @@ public void setPurgeValuesLimit(int purgeValuesLimit) {
                         dpvo.getPurgeValuesLimit()
                 );
 
-                json = mapper.writeValueAsString(p);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(p, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
 
     @RequestMapping(value = "/getProperties/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getProperties(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<PropertiesPointToJSON> getProperties(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/point_properties/getProperties/{xid} id:" + xid);
 
         try {
@@ -357,266 +110,8 @@ public ResponseEntity<String> getProperties(@PathVariable("xid") String xid, Htt
             User user = Common.getUser(request);
             if (user != null) {
                 DataPointVO dpvo = dataPointService.getDataPoint(xid);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 ResourceBundle bundle = Common.getBundle(request);
 
-                class PropertiesPointToJSON implements Serializable {
-
-                    private static final long serialVersionUID = 1L;
-
-                    private String chartColour;
-                    private ChartRenderer chartRenderer;
-                    private String descConfiguration;
-                    private String dataSourceName;
-                    private String dataSourceXId;
-                    private String dataTypeMessage;
-                    private String deviceName;
-                    private String description;
-                    private Double discardHighLimit;
-                    private Double discardLowLimit;
-                    private int engineeringUnits;
-                    private String extendedName;
-                    private EventTextRenderer eventTextRenderer;
-                    private int intervalLoggingPeriod;
-                    private int intervalLoggingPeriodType;
-                    private int intervalLoggingType;
-                    private String name;
-                    private int purgePeriod;
-                    private int purgeType;
-                    private TextRenderer textRenderer;
-                    private double tolerance;
-                    private String typeKey;
-                    private int purgeStrategy;
-                    private int purgeValuesLimit;
-
-                    public PropertiesPointToJSON(String chartColour, ChartRenderer chartRenderer, String descConfiguration, String dataSourceName, String dataSourceXId,
-                                                 String dataTypeMessage, String deviceName, String description, Double discardHighLimit, Double discardLowLimit, int engineeringUnits, String extendedName, EventTextRenderer eventTextRenderer,
-                                                 int intervalLoggingPeriod, int intervalLoggingPeriodType, int intervalLoggingType, String name, int purgePeriod, int purgeType, TextRenderer textRenderer, double tolerance, String typeKey,
-                                                 int purgeStrategy, int purgeValuesLimit) {
-
-                        this.chartColour = chartColour;
-                        this.chartRenderer = chartRenderer;
-                        this.descConfiguration = descConfiguration;
-                        this.dataSourceName = dataSourceName;
-                        this.dataSourceXId = dataSourceXId;
-                        this.dataTypeMessage = dataTypeMessage;
-                        this.deviceName = deviceName;
-                        this.description = description;
-                        this.discardHighLimit = discardHighLimit;
-                        this.discardLowLimit = discardLowLimit;
-                        this.engineeringUnits = engineeringUnits;
-                        this.extendedName = extendedName;
-                        this.eventTextRenderer = eventTextRenderer;
-                        this.intervalLoggingPeriod = intervalLoggingPeriod;
-                        this.intervalLoggingPeriodType = intervalLoggingPeriodType;
-                        this.intervalLoggingType = intervalLoggingType;
-                        this.name = name;
-                        this.purgePeriod = purgePeriod;
-                        this.purgeType = purgeType;
-                        this.textRenderer = textRenderer;
-                        this.tolerance = tolerance;
-                        this.typeKey = typeKey;
-                        this.purgeStrategy = purgeStrategy;
-                        this.purgeValuesLimit = purgeValuesLimit;
-                    }
-
-                    public String getChartColour() {
-                        return chartColour;
-                    }
-
-                    public void setChartColour(String chartColour) {
-                        this.chartColour = chartColour;
-                    }
-
-                    public ChartRenderer getChartRenderer() {
-                        return chartRenderer;
-                    }
-
-                    public void setChartRenderer(ChartRenderer chartRenderer) {
-                        this.chartRenderer = chartRenderer;
-                    }
-
-                    public String getDescConfiguration() {
-                        return descConfiguration;
-                    }
-
-                    public void setDescConfiguration(String descConfiguration) {
-                        this.descConfiguration = descConfiguration;
-                    }
-
-                    public String getDataSourceName() {
-                        return dataSourceName;
-                    }
-
-                    public void setDataSourceName(String dataSourceName) {
-                        this.dataSourceName = dataSourceName;
-                    }
-
-                    public String getDataSourceXId() {
-                        return dataSourceXId;
-                    }
-
-                    public void setDataSourceXId(String dataSourceXId) {
-                        this.dataSourceXId = dataSourceXId;
-                    }
-
-                    public String getDataTypeMessage() {
-                        return dataTypeMessage;
-                    }
-
-                    public void setDataTypeMessage(String dataTypeMessage) {
-                        this.dataTypeMessage = dataTypeMessage;
-                    }
-
-                    public String getDeviceName() {
-                        return deviceName;
-                    }
-
-                    public void setDeviceName(String deviceName) {
-                        this.deviceName = deviceName;
-                    }
-
-                    public String getDescription() {
-                        return description;
-                    }
-
-                    public void setDescription(String description) {
-                        this.description = description;
-                    }
-
-                    public Double getDiscardHighLimit() {
-                        return discardHighLimit;
-                    }
-
-                    public void setDiscardHighLimit(Double discardHighLimit) {
-                        this.discardHighLimit = discardHighLimit;
-                    }
-
-                    public Double getDiscardLowLimit() {
-                        return discardLowLimit;
-                    }
-
-                    public void setDiscardLowLimit(Double discardLowLimit) {
-                        this.discardLowLimit = discardLowLimit;
-                    }
-
-                    public int getEngineeringUnits() {
-                        return engineeringUnits;
-                    }
-
-                    public void setEngineeringUnits(int engineeringUnits) {
-                        this.engineeringUnits = engineeringUnits;
-                    }
-
-                    public String getExtendedName() {
-                        return extendedName;
-                    }
-
-                    public void setExtendedName(String extendedName) {
-                        this.extendedName = extendedName;
-                    }
-
-                    public EventTextRenderer getEventTextRenderer() {
-                        return eventTextRenderer;
-                    }
-
-                    public void setEventTextRenderer(EventTextRenderer eventTextRenderer) {
-                        this.eventTextRenderer = eventTextRenderer;
-                    }
-
-                    public int getIntervalLoggingPeriod() {
-                        return intervalLoggingPeriod;
-                    }
-
-                    public void setIntervalLoggingPeriod(int intervalLoggingPeriod) {
-                        this.intervalLoggingPeriod = intervalLoggingPeriod;
-                    }
-
-                    public int getIntervalLoggingPeriodType() {
-                        return intervalLoggingPeriodType;
-                    }
-
-                    public void setIntervalLoggingPeriodType(int intervalLoggingPeriodType) {
-                        this.intervalLoggingPeriodType = intervalLoggingPeriodType;
-                    }
-
-                    public int getIntervalLoggingType() {
-                        return intervalLoggingType;
-                    }
-
-                    public void setIntervalLoggingType(int intervalLoggingType) {
-                        this.intervalLoggingType = intervalLoggingType;
-                    }
-
-                    public String getName() {
-                        return name;
-                    }
-
-                    public void setName(String name) {
-                        this.name = name;
-                    }
-
-                    public int getPurgePeriod() {
-                        return purgePeriod;
-                    }
-
-                    public void setPurgePeriod(int purgePeriod) {
-                        this.purgePeriod = purgePeriod;
-                    }
-
-                    public int getPurgeType() {
-                        return purgeType;
-                    }
-
-                    public void setPurgeType(int purgeType) {
-                        this.purgeType = purgeType;
-                    }
-
-                    public TextRenderer getTextRenderer() {
-                        return textRenderer;
-                    }
-
-                    public void setTextRenderer(TextRenderer textRenderer) {
-                        this.textRenderer = textRenderer;
-                    }
-
-                    public double getTolerance() {
-                        return tolerance;
-                    }
-
-                    public void setTolerance(double tolerance) {
-                        this.tolerance = tolerance;
-                    }
-
-                    public String getTypeKey() {
-                        return typeKey;
-                    }
-
-                    public void setTypeKey(String typeKey) {
-                        this.typeKey = typeKey;
-                    }
-
-                    public int getPurgeStrategy() {
-                        return purgeStrategy;
-                    }
-
-                    public void setPurgeStrategy(int purgeStrategy) {
-                        this.purgeStrategy = purgeStrategy;
-                    }
-
-                    public int getPurgeValuesLimit() {
-                        return purgeValuesLimit;
-                    }
-
-                    public void setPurgeValuesLimit(int purgeValuesLimit) {
-                        this.purgeValuesLimit = purgeValuesLimit;
-                    }
-                }
-
-                //dpvo.isDiscardExtremeValues()
-
                 PropertiesPointToJSON p = new PropertiesPointToJSON(
                         dpvo.getChartColour(),
                         dpvo.getChartRenderer(),
@@ -645,39 +140,43 @@ public void setPurgeValuesLimit(int purgeValuesLimit) {
                         dpvo.getPurgeStrategy(),
                         dpvo.getPurgeValuesLimit());
 
-                json = mapper.writeValueAsString(p);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(p, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
 
     }
 
     @PutMapping(value = "/updateProperties")
-    public ResponseEntity<String> updatePointProperties(@RequestParam(required = false) Integer id,
+    public ResponseEntity<Map<String, String>> updatePointProperties(@RequestParam(required = false) Integer id,
                                                         @RequestParam(required = false) String xid,
                                                         HttpServletRequest request,
                                                         @RequestBody JsonPointProperties body) {
         try {
             User user = Common.getUser(request);
             if (user != null) {
+                Map<String, String> response = new HashMap<>();
                 String error = validPointProperties(id, xid, body);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
 
                 return getDataPointByIdOrXid(id, xid, dataPointService).map(dataPoint -> {
                     updateValuePointProperties(dataPoint, body);
                     dataPointService.updateDataPoint(dataPoint);
                     Common.ctx.getRuntimeManager().saveDataPoint(dataPoint);
-                    return new ResponseEntity<>(SAVED_MSG, HttpStatus.OK);
-                }).orElse(new ResponseEntity<>(formatErrorsJson("dataPoint not found"), HttpStatus.NOT_FOUND));
+                    response.put("status", SAVED_MSG);
+                    return new ResponseEntity<>(response, HttpStatus.OK);
+                }).orElseGet(() -> {
+                    response.put("errors", "dataPoint not found");
+                    return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
+                });
 
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -689,7 +188,7 @@ public ResponseEntity<String> updatePointProperties(@RequestParam(required = fal
     }
 
     @GetMapping(value = "/getPointDescription", produces = "application/json")
-    public ResponseEntity<String> getPointDescription(@RequestParam(required = false) Integer id,
+    public ResponseEntity<Map<String, String>> getPointDescription(@RequestParam(required = false) Integer id,
                                                       @RequestParam(required = false) String xid,
                                                       HttpServletRequest request) {
         LOG.info("/api/point_properties/getPointDescription");
@@ -698,7 +197,9 @@ public ResponseEntity<String> getPointDescription(@RequestParam(required = false
             if (user != null && user.isAdmin()) {
                 String error = validId(id, xid);
                 if(!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    Map<String, String> errors = new HashMap<>();
+                    errors.put("errors", error);
+                    return ResponseEntity.badRequest().body(errors);
                 }
                 return getPointDescription(id, xid);
             } else {
@@ -739,7 +240,7 @@ public ResponseEntity<JsonBinaryEventTextRenderer> getBinaryEventRenderer(@Reque
     }
 
     @PatchMapping(value = "/{id}/purgeNowPeriod")
-    public ResponseEntity<String> purgeNowPeriodDataPointValues(@PathVariable("id") Integer id,
+    public ResponseEntity<Map<String, String>> purgeNowPeriodDataPointValues(@PathVariable("id") Integer id,
                                                        @RequestParam Integer type,
                                                        @RequestParam Integer period,
                                                        HttpServletRequest request) {
@@ -748,7 +249,9 @@ public ResponseEntity<String> purgeNowPeriodDataPointValues(@PathVariable("id")
             if(user != null) {
                 String error = validPurgeTypeAndPeriod(type,period);
                 if(!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    Map<String, String> errors = new HashMap<>();
+                    errors.put("errors", error);
+                    return ResponseEntity.badRequest().body(errors);
                 }
                 return purgeNowPeriodDataPointValues(id, type, period);
             } else {
@@ -760,7 +263,7 @@ public ResponseEntity<String> purgeNowPeriodDataPointValues(@PathVariable("id")
     }
 
     @PatchMapping(value = "/{id}/purgeNowAll")
-    public ResponseEntity<String> purgeNowAllDataPointValues(@PathVariable("id") Integer id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> purgeNowAllDataPointValues(@PathVariable("id") Integer id, HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if(user != null) {
@@ -774,7 +277,7 @@ public ResponseEntity<String> purgeNowAllDataPointValues(@PathVariable("id") Int
     }
 
     @PatchMapping(value = "/{id}/purgeNowLimit")
-    public ResponseEntity<String> purgeNowWithLimitDataPointValues(@PathVariable("id") Integer id,
+    public ResponseEntity<Map<String, String>> purgeNowWithLimitDataPointValues(@PathVariable("id") Integer id,
                                                                 @RequestParam Integer limit,
                                                                 HttpServletRequest request) {
         try {
@@ -782,7 +285,9 @@ public ResponseEntity<String> purgeNowWithLimitDataPointValues(@PathVariable("id
             if(user != null) {
                 String error = validPurgeLimit(limit);
                 if(!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    Map<String, String> errors = new HashMap<>();
+                    errors.put("errors", error);
+                    return ResponseEntity.badRequest().body(errors);
                 }
                 return purgeNowWithLimitDataPointValues(id, limit);
             } else {
@@ -815,19 +320,22 @@ public ResponseEntity<String> clearDataPointCache(@PathVariable("id") int id, Ht
     }
 
     @PatchMapping(value = "/{id}/toggle")
-    public ResponseEntity<String> toggleDataPoint(@PathVariable("id") int id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> toggleDataPoint(@PathVariable("id") int id, HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if(user != null) {
+                Map<String, String> response = new HashMap<>();
                 DataPointVO point = dataPointService.getDataPoint(id);
                 RuntimeManager rm = Common.ctx.getRuntimeManager();
                 point.setEnabled(!point.isEnabled());
                 rm.saveDataPoint(point);
 
                 if(point.isEnabled()) {
-                    return new ResponseEntity<>("{\"enabled\":true}", HttpStatus.OK);
+                    response.put("enabled", "true");
+                    return new ResponseEntity<>(response, HttpStatus.OK);
                 } else {
-                    return new ResponseEntity<>("{\"enabled\":false}", HttpStatus.OK);
+                    response.put("enabled", "false");
+                    return new ResponseEntity<>(response, HttpStatus.OK);
                 }
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -837,24 +345,18 @@ public ResponseEntity<String> toggleDataPoint(@PathVariable("id") int id, HttpSe
         }
     }
 
-    private ResponseEntity<String> getPointDescription(Integer id, String xid) {
+    private ResponseEntity<Map<String, String>> getPointDescription(Integer id, String xid) {
         Map<String, String> response = new HashMap<>();
         getDataPointByIdOrXid(id, xid, dataPointService)
                 .ifPresent(a -> response.put("description", a.getDescription()));
         if(response.isEmpty()) {
-            return new ResponseEntity<>(formatErrorsJson("dataPoint not found"),HttpStatus.NOT_FOUND);
-        }
-        ObjectMapper mapper = new ObjectMapper();
-        try {
-            String json = mapper.writeValueAsString(response);
-            return new ResponseEntity<>(json, HttpStatus.OK);
-        } catch (JsonProcessingException e) {
-            LOG.error(e.getMessage(), e);
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+            response.put("errors", "dataPoint not found");
+            return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
         }
+        return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
-    private ResponseEntity<String> purgeNowPeriodDataPointValues(Integer id, Integer type, Integer period) {
+    private ResponseEntity<Map<String, String>> purgeNowPeriodDataPointValues(Integer id, Integer type, Integer period) {
         RuntimeManager rm = Common.ctx.getRuntimeManager();
         Map<String, Long> response = new HashMap<>();
         getDataPointById(id, dataPointService)
@@ -862,7 +364,7 @@ private ResponseEntity<String> purgeNowPeriodDataPointValues(Integer id, Integer
         return prepareResponseForDataPurge(response);
     }
 
-    private ResponseEntity<String> purgeNowAllDataPointValues(Integer id) {
+    private ResponseEntity<Map<String, String>> purgeNowAllDataPointValues(Integer id) {
         RuntimeManager rm = Common.ctx.getRuntimeManager();
         Map<String, Long> response = new HashMap<>();
         getDataPointById(id, dataPointService)
@@ -870,7 +372,7 @@ private ResponseEntity<String> purgeNowAllDataPointValues(Integer id) {
         return prepareResponseForDataPurge(response);
     }
 
-    private ResponseEntity<String> purgeNowWithLimitDataPointValues(Integer id, Integer limit) {
+    private ResponseEntity<Map<String, String>> purgeNowWithLimitDataPointValues(Integer id, Integer limit) {
         RuntimeManager rm = Common.ctx.getRuntimeManager();
         Map<String, Long> response = new HashMap<>();
         getDataPointById(id, dataPointService)
@@ -878,17 +380,354 @@ private ResponseEntity<String> purgeNowWithLimitDataPointValues(Integer id, Inte
         return prepareResponseForDataPurge(response);
     }
 
-    private ResponseEntity<String> prepareResponseForDataPurge(Map<String, Long> response) {
+    private ResponseEntity<Map<String, String>> prepareResponseForDataPurge(Map<String, Long> response) {
         if(response.isEmpty()) {
-            return new ResponseEntity<>(formatErrorsJson("dataPoint not found"),HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
         }
-        ObjectMapper mapper = new ObjectMapper();
-        try {
-            String json = mapper.writeValueAsString(response);
-            return new ResponseEntity<>(json, HttpStatus.OK);
-        } catch (JsonProcessingException e) {
-            LOG.error(e.getMessage(), e);
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        return new ResponseEntity<>(response.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> String.valueOf(entry.getValue()))), HttpStatus.OK);
+    }
+
+    static class PropertiesPointToJSON implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        private String chartColour;
+        private ChartRenderer chartRenderer;
+        private String descConfiguration;
+        private String dataSourceName;
+        private String dataSourceXId;
+        private String dataTypeMessage;
+        private String deviceName;
+        private String description;
+        private Double discardHighLimit;
+        private Double discardLowLimit;
+        private int engineeringUnits;
+        private String extendedName;
+        private EventTextRenderer eventTextRenderer;
+        private int intervalLoggingPeriod;
+        private int intervalLoggingPeriodType;
+        private int intervalLoggingType;
+        private String name;
+        private int purgePeriod;
+        private int purgeType;
+        private TextRenderer textRenderer;
+        private double tolerance;
+        private String typeKey;
+        private int purgeStrategy;
+        private int purgeValuesLimit;
+        private int loggingType;
+        private int defaultCacheSize;
+        private ImplDefinition def;
+        private boolean isDiscardExtremeValues;
+        private int dataTypeId;
+
+        public PropertiesPointToJSON(
+                String description,
+                int loggingType,
+                int intervalLoggingPeriod,
+                int intervalLoggingPeriodType,
+                int purgeType,
+                int purgePeriod,
+                int defaultCacheSize,
+                String typeKey,
+                TextRenderer textRenderer,
+                EventTextRenderer eventTextRenderer,
+                ImplDefinition def,
+                ChartRenderer chartRenderer,
+                int engineeringUnits,
+                double tolerance,
+                int intervalLoggingType,
+                boolean isDiscardExtremeValues,
+                double discardLowLimit,
+                double discardHighLimit,
+                int dataTypeId,
+                int purgeStrategy,
+                int purgeValuesLimit
+        ) {
+            this.description = description;
+            this.loggingType = loggingType;
+            this.intervalLoggingPeriod = intervalLoggingPeriod;
+            this.intervalLoggingPeriodType = intervalLoggingPeriodType;
+            this.purgeType = purgeType;
+            this.purgePeriod =  purgePeriod;
+            this.defaultCacheSize = defaultCacheSize;
+            this.typeKey = typeKey;
+            this.textRenderer = textRenderer;
+            this.eventTextRenderer = eventTextRenderer;
+            this.def = def;
+            this.chartRenderer = chartRenderer;
+            this.engineeringUnits = engineeringUnits;
+            this.tolerance = tolerance;
+            this.intervalLoggingType = intervalLoggingType;
+            this.isDiscardExtremeValues = isDiscardExtremeValues;
+            this.discardLowLimit = discardLowLimit;
+            this.discardHighLimit = discardHighLimit;
+            this.dataTypeId = dataTypeId;
+            this.purgeStrategy = purgeStrategy;
+            this.purgeValuesLimit = purgeValuesLimit;
+        }
+
+        public PropertiesPointToJSON(String chartColour, ChartRenderer chartRenderer, String descConfiguration, String dataSourceName, String dataSourceXId,
+                                     String dataTypeMessage, String deviceName, String description, Double discardHighLimit, Double discardLowLimit, int engineeringUnits, String extendedName, EventTextRenderer eventTextRenderer,
+                                     int intervalLoggingPeriod, int intervalLoggingPeriodType, int intervalLoggingType, String name, int purgePeriod, int purgeType, TextRenderer textRenderer, double tolerance, String typeKey,
+                                     int purgeStrategy, int purgeValuesLimit) {
+
+            this.chartColour = chartColour;
+            this.chartRenderer = chartRenderer;
+            this.descConfiguration = descConfiguration;
+            this.dataSourceName = dataSourceName;
+            this.dataSourceXId = dataSourceXId;
+            this.dataTypeMessage = dataTypeMessage;
+            this.deviceName = deviceName;
+            this.description = description;
+            this.discardHighLimit = discardHighLimit;
+            this.discardLowLimit = discardLowLimit;
+            this.engineeringUnits = engineeringUnits;
+            this.extendedName = extendedName;
+            this.eventTextRenderer = eventTextRenderer;
+            this.intervalLoggingPeriod = intervalLoggingPeriod;
+            this.intervalLoggingPeriodType = intervalLoggingPeriodType;
+            this.intervalLoggingType = intervalLoggingType;
+            this.name = name;
+            this.purgePeriod = purgePeriod;
+            this.purgeType = purgeType;
+            this.textRenderer = textRenderer;
+            this.tolerance = tolerance;
+            this.typeKey = typeKey;
+            this.purgeStrategy = purgeStrategy;
+            this.purgeValuesLimit = purgeValuesLimit;
+        }
+
+        public String getChartColour() {
+            return chartColour;
+        }
+
+        public void setChartColour(String chartColour) {
+            this.chartColour = chartColour;
+        }
+
+        public ChartRenderer getChartRenderer() {
+            return chartRenderer;
+        }
+
+        public void setChartRenderer(ChartRenderer chartRenderer) {
+            this.chartRenderer = chartRenderer;
+        }
+
+        public String getDescConfiguration() {
+            return descConfiguration;
+        }
+
+        public void setDescConfiguration(String descConfiguration) {
+            this.descConfiguration = descConfiguration;
+        }
+
+        public String getDataSourceName() {
+            return dataSourceName;
+        }
+
+        public void setDataSourceName(String dataSourceName) {
+            this.dataSourceName = dataSourceName;
+        }
+
+        public String getDataSourceXId() {
+            return dataSourceXId;
+        }
+
+        public void setDataSourceXId(String dataSourceXId) {
+            this.dataSourceXId = dataSourceXId;
+        }
+
+        public String getDataTypeMessage() {
+            return dataTypeMessage;
+        }
+
+        public void setDataTypeMessage(String dataTypeMessage) {
+            this.dataTypeMessage = dataTypeMessage;
+        }
+
+        public String getDeviceName() {
+            return deviceName;
+        }
+
+        public void setDeviceName(String deviceName) {
+            this.deviceName = deviceName;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public Double getDiscardHighLimit() {
+            return discardHighLimit;
+        }
+
+        public void setDiscardHighLimit(Double discardHighLimit) {
+            this.discardHighLimit = discardHighLimit;
+        }
+
+        public Double getDiscardLowLimit() {
+            return discardLowLimit;
+        }
+
+        public void setDiscardLowLimit(Double discardLowLimit) {
+            this.discardLowLimit = discardLowLimit;
+        }
+
+        public int getEngineeringUnits() {
+            return engineeringUnits;
+        }
+
+        public void setEngineeringUnits(int engineeringUnits) {
+            this.engineeringUnits = engineeringUnits;
+        }
+
+        public String getExtendedName() {
+            return extendedName;
+        }
+
+        public void setExtendedName(String extendedName) {
+            this.extendedName = extendedName;
+        }
+
+        public EventTextRenderer getEventTextRenderer() {
+            return eventTextRenderer;
+        }
+
+        public void setEventTextRenderer(EventTextRenderer eventTextRenderer) {
+            this.eventTextRenderer = eventTextRenderer;
+        }
+
+        public int getIntervalLoggingPeriod() {
+            return intervalLoggingPeriod;
+        }
+
+        public void setIntervalLoggingPeriod(int intervalLoggingPeriod) {
+            this.intervalLoggingPeriod = intervalLoggingPeriod;
+        }
+
+        public int getIntervalLoggingPeriodType() {
+            return intervalLoggingPeriodType;
+        }
+
+        public void setIntervalLoggingPeriodType(int intervalLoggingPeriodType) {
+            this.intervalLoggingPeriodType = intervalLoggingPeriodType;
+        }
+
+        public int getIntervalLoggingType() {
+            return intervalLoggingType;
+        }
+
+        public void setIntervalLoggingType(int intervalLoggingType) {
+            this.intervalLoggingType = intervalLoggingType;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getPurgePeriod() {
+            return purgePeriod;
+        }
+
+        public void setPurgePeriod(int purgePeriod) {
+            this.purgePeriod = purgePeriod;
+        }
+
+        public int getPurgeType() {
+            return purgeType;
+        }
+
+        public void setPurgeType(int purgeType) {
+            this.purgeType = purgeType;
+        }
+
+        public TextRenderer getTextRenderer() {
+            return textRenderer;
+        }
+
+        public void setTextRenderer(TextRenderer textRenderer) {
+            this.textRenderer = textRenderer;
+        }
+
+        public double getTolerance() {
+            return tolerance;
+        }
+
+        public void setTolerance(double tolerance) {
+            this.tolerance = tolerance;
+        }
+
+        public String getTypeKey() {
+            return typeKey;
+        }
+
+        public void setTypeKey(String typeKey) {
+            this.typeKey = typeKey;
+        }
+
+        public int getPurgeStrategy() {
+            return purgeStrategy;
+        }
+
+        public void setPurgeStrategy(int purgeStrategy) {
+            this.purgeStrategy = purgeStrategy;
+        }
+
+        public int getPurgeValuesLimit() {
+            return purgeValuesLimit;
+        }
+
+        public void setPurgeValuesLimit(int purgeValuesLimit) {
+            this.purgeValuesLimit = purgeValuesLimit;
+        }
+
+        public int getLoggingType() {
+            return loggingType;
+        }
+
+        public void setLoggingType(int loggingType) {
+            this.loggingType = loggingType;
+        }
+
+        public int getDefaultCacheSize() {
+            return defaultCacheSize;
+        }
+
+        public void setDefaultCacheSize(int defaultCacheSize) {
+            this.defaultCacheSize = defaultCacheSize;
+        }
+
+        public ImplDefinition getDef() {
+            return def;
+        }
+
+        public void setDef(ImplDefinition def) {
+            this.def = def;
+        }
+
+        public boolean isDiscardExtremeValues() {
+            return isDiscardExtremeValues;
+        }
+
+        public void setDiscardExtremeValues(boolean discardExtremeValues) {
+            isDiscardExtremeValues = discardExtremeValues;
+        }
+
+        public int getDataTypeId() {
+            return dataTypeId;
+        }
+
+        public void setDataTypeId(int dataTypeId) {
+            this.dataTypeId = dataTypeId;
         }
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/PointValueAPI.java b/src/org/scada_lts/web/mvc/api/PointValueAPI.java
index 1d5b0c6e98..dbd2211463 100644
--- a/src/org/scada_lts/web/mvc/api/PointValueAPI.java
+++ b/src/org/scada_lts/web/mvc/api/PointValueAPI.java
@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import com.serotonin.mango.DataTypes;
@@ -13,14 +12,12 @@
 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.DataSourceService;
 import org.scada_lts.mango.service.PointValueService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.rt.dataImage.PointValueTime;
 import com.serotonin.mango.rt.dataImage.types.AlphanumericValue;
@@ -321,11 +318,13 @@ public class PointValueAPI {
 
     private static final Log LOG = LogFactory.getLog(PointValueAPI.class);
 
-    private DataPointService dataPointService = new DataPointService();
-    private DataSourceService dataSourceService = new DataSourceService();
+    private final DataPointService dataPointService;
+    private final PointValueService pointValueService;
 
-    @Resource
-    private PointValueService pointValueService;
+    public PointValueAPI(DataPointService dataPointService,PointValueService pointValueService) {
+        this.dataPointService = dataPointService;
+        this.pointValueService = pointValueService;
+    }
 
     private String getValue(MangoValue value, String type) {
 
@@ -356,7 +355,7 @@ private String getValue(MangoValue value, String type) {
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValue/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValue(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<ValueToJSON> getValue(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/point_value/getValue/{xid} id:" + xid);
 
         try {
@@ -365,29 +364,22 @@ public ResponseEntity<String> getValue(@PathVariable("xid") String xid, HttpServ
             if (user != null) {
                 DataPointVO dpvo = dataPointService.getDataPoint(xid);
                 PointValueTime pvt = pointValueService.getLatestPointValue(dpvo.getId());
-                
+
                 // API should show datapoint is disabled if datasource is disabled
                 dpvo.setEnabled(dataPointService.isDataPointRunning(dpvo));
 
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 ValueToJSON v = new ValueToJSON();
                 if (pvt != null)
                     v.set(pvt, dpvo);
                 else
                     v.setDataPoint(dpvo);
-
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
-
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -397,7 +389,7 @@ public ResponseEntity<String> getValue(@PathVariable("xid") String xid, HttpServ
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValue/id/{id}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValue(@PathVariable("id") int id, HttpServletRequest request) {
+    public ResponseEntity<ValueToJSON> getValue(@PathVariable("id") int id, HttpServletRequest request) {
         LOG.info("/api/point_value/getValue/id/{id} id:" + id);
 
         try {
@@ -410,25 +402,19 @@ public ResponseEntity<String> getValue(@PathVariable("id") int id, HttpServletRe
                 // API should show datapoint is disabled if datasource is disabled
                 dpvo.setEnabled(dataPointService.isDataPointRunning(dpvo));
 
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 ValueToJSON v = new ValueToJSON();
                 if (pvt != null)
                     v.set(pvt, dpvo);
                 else
                     v.setDataPoint(dpvo);
-
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -541,7 +527,7 @@ public ResponseEntity<String> setValueGet(
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValuesFromTime/{ts}/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValuesFromTime(@PathVariable("ts") long ts, @PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<ValuesToJSON> getValuesFromTime(@PathVariable("ts") long ts, @PathVariable("xid") String xid, HttpServletRequest request) {
 
         LOG.info("/api/point_value/getValuesFromTime/{ts}/{xid} ts:" + ts + " id:" + xid);
 
@@ -551,8 +537,6 @@ public ResponseEntity<String> getValuesFromTime(@PathVariable("ts") long ts, @Pa
             if (user != null) {
                 long to = System.currentTimeMillis();
                 List<PointValueTime> pvts = pointValueService.getPointValuesBetween(dpvo.getId(), ts, to);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
 
                 List<ValueTime> values = new ArrayList<ValueTime>();
                 String type = null;
@@ -560,16 +544,14 @@ public ResponseEntity<String> getValuesFromTime(@PathVariable("ts") long ts, @Pa
                     values.add(new ValueTime(getValue(pvt.getValue(), type), pvt.getTime()));
                 }
                 ValuesToJSON v = new ValuesToJSON(values, dpvo, type, ts, to);
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -579,7 +561,7 @@ public ResponseEntity<String> getValuesFromTime(@PathVariable("ts") long ts, @Pa
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValuesFromTime/id/{ts}/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValuesFromTimeId(@PathVariable("ts") long ts, @PathVariable("xid") int id, HttpServletRequest request) {
+    public ResponseEntity<ValuesToJSON> getValuesFromTimeId(@PathVariable("ts") long ts, @PathVariable("xid") int id, HttpServletRequest request) {
 
         LOG.info("/api/point_value/getValuesFromTime/{ts}/{xid} ts:" + ts + " id:" + id);
 
@@ -589,25 +571,20 @@ public ResponseEntity<String> getValuesFromTimeId(@PathVariable("ts") long ts, @
             if (user != null) {
                 long to = System.currentTimeMillis();
                 List<PointValueTime> pvts = pointValueService.getPointValuesBetween(dpvo.getId(), ts, to);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 List<ValueTime> values = new ArrayList<ValueTime>();
                 String type = null;
                 for (PointValueTime pvt : pvts) {
                     values.add(new ValueTime(getValue(pvt.getValue(), type), pvt.getTime()));
                 }
                 ValuesToJSON v = new ValuesToJSON(values, dpvo, type, ts, to);
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -619,7 +596,7 @@ public ResponseEntity<String> getValuesFromTimeId(@PathVariable("ts") long ts, @
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValuesFromTimePeriod/xid/{xid}/{sts}/{ets}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValuesFromTimePeriodXid(@PathVariable("xid") String xid, @PathVariable("sts") long sts, @PathVariable("ets") long ets, HttpServletRequest request) {
+    public ResponseEntity<ValuesToJSON> getValuesFromTimePeriodXid(@PathVariable("xid") String xid, @PathVariable("sts") long sts, @PathVariable("ets") long ets, HttpServletRequest request) {
 
         LOG.info("/api/point_value/getValuesFromTimePeriod/xid/{id}/{sts}/{ets} id: " + xid + " sts: " + sts + " ets: " + ets);
 
@@ -628,9 +605,6 @@ public ResponseEntity<String> getValuesFromTimePeriodXid(@PathVariable("xid") St
             DataPointVO dpvo = dataPointService.getDataPoint(xid);
             if (user != null) {
                 List<PointValueTime> pvts = pointValueService.getPointValuesBetween(dpvo.getId(), sts, ets);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 List<ValueTime> values = new ArrayList<ValueTime>();
                 String type = null;
                 if(pvts.size() > 0) {
@@ -644,16 +618,14 @@ public ResponseEntity<String> getValuesFromTimePeriodXid(@PathVariable("xid") St
                     values.add(new ValueTime(getValue(pvt.getValue(), type), pvt.getTime()));
                 }
                 ValuesToJSON v = new ValuesToJSON(values, dpvo, type, sts, ets);
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -663,7 +635,7 @@ public ResponseEntity<String> getValuesFromTimePeriodXid(@PathVariable("xid") St
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValuesFromTimePeriod/{id}/{sts}/{ets}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValuesFromTimePeriod(@PathVariable("id") int id, @PathVariable("sts") long sts, @PathVariable("ets") long ets, HttpServletRequest request) {
+    public ResponseEntity<ValuesToJSON> getValuesFromTimePeriod(@PathVariable("id") int id, @PathVariable("sts") long sts, @PathVariable("ets") long ets, HttpServletRequest request) {
 
         LOG.info("/api/point_value/getValuesFromTimePeriod/{id}/{sts}/{ets} id: " + id + " sts: " + sts + " ets: " + ets);
 
@@ -672,9 +644,6 @@ public ResponseEntity<String> getValuesFromTimePeriod(@PathVariable("id") int id
             DataPointVO dpvo = dataPointService.getDataPoint(id);
             if (user != null) {
                 List<PointValueTime> pvts = pointValueService.getPointValuesBetween(dpvo.getId(), sts, ets);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 List<ValueTime> values = new ArrayList<ValueTime>();
                 String type = null;
                 if(pvts.size() > 0) {
@@ -688,16 +657,14 @@ public ResponseEntity<String> getValuesFromTimePeriod(@PathVariable("id") int id
                     values.add(new ValueTime(getValue(pvt.getValue(), type), pvt.getTime()));
                 }
                 ValuesToJSON v = new ValuesToJSON(values, dpvo, type, sts, ets);
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
diff --git a/src/org/scada_lts/web/mvc/api/ScriptsAPI.java b/src/org/scada_lts/web/mvc/api/ScriptsAPI.java
index a2274209d2..5972c33dd9 100644
--- a/src/org/scada_lts/web/mvc/api/ScriptsAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ScriptsAPI.java
@@ -16,7 +16,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
@@ -35,11 +34,13 @@ public class ScriptsAPI {
 
     private static final Log LOG = LogFactory.getLog(ScriptsAPI.class);
 
-    @Resource
-    private ScriptService scriptService;
+    private final ScriptService scriptService;
+    private final DataPointService dataPointService;
 
-    @Resource
-    private DataPointService dataPointService;
+    public ScriptsAPI(ScriptService scriptService, DataPointService dataPointService) {
+        this.scriptService = scriptService;
+        this.dataPointService = dataPointService;
+    }
 
     /**
      * Get Scripts related to specific Data Point
@@ -155,14 +156,16 @@ public ResponseEntity<Map<String, Object>> saveScript(@RequestBody JsonScript js
     }
 
     @PutMapping(value = "/update")
-    public ResponseEntity<String> updateScript(@RequestBody JsonScript jsonBodyRequest, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> updateScript(@RequestBody JsonScript jsonBodyRequest, HttpServletRequest request) {
         LOG.info("PUT::/api/scripts/update");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateScriptUpdate(jsonBodyRequest);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 return findAndUpdateScript(jsonBodyRequest);
             } else {
@@ -187,22 +190,28 @@ public ResponseEntity<String> getUniqueXid(HttpServletRequest request) {
         }
     }
 
-    private ResponseEntity<String> findAndUpdateScript(JsonScript body) {
+    private ResponseEntity<Map<String, String>> findAndUpdateScript(JsonScript body) {
+        Map<String, String> errors = new HashMap<>();
+        errors.put("errors", "Script not found");
         return getScript(body.getId(), scriptService).map(toUpdate -> updateScriptBody(toUpdate, body))
-                .orElse(new ResponseEntity<>(formatErrorsJson("Script not found"), HttpStatus.NOT_FOUND));
+                .orElse(new ResponseEntity<>(errors, HttpStatus.NOT_FOUND));
     }
 
-    private ResponseEntity<String> updateScriptBody(ContextualizedScriptVO toUpdate, JsonScript body) {
+    private ResponseEntity<Map<String, String>> updateScriptBody(ContextualizedScriptVO toUpdate, JsonScript body) {
+        Map<String, String> response = new HashMap<>();
         if (isXidChanged(toUpdate.getXid(), body.getXid()) &&
-                isScriptPresent(body.getXid(), scriptService)){
-            return new ResponseEntity<>(formatErrorsJson("This XID is already in use"), HttpStatus.BAD_REQUEST);
+                isScriptPresent(body.getXid(), scriptService)) {
+            response.put("errors", "This XID is already in use");
+            return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
         }
         String pointsError = validatePointsOnContext(body.getPointsOnContext(), dataPointService);
         if (!pointsError.isEmpty()) {
-            return new ResponseEntity<>(formatErrorsJson(pointsError), HttpStatus.NOT_FOUND);
+            response.put("errors", pointsError);
+            return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
         }
         updateValueScript(toUpdate, body, dataPointService);
         scriptService.saveScript(toUpdate);
-        return new ResponseEntity<>("{\"status\":\"updated\"}", HttpStatus.OK);
+        response.put("status", "updated");
+        return new ResponseEntity<>(response, HttpStatus.OK);
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/SystemSettingsAPI.java b/src/org/scada_lts/web/mvc/api/SystemSettingsAPI.java
index edf8682488..5f3568779f 100644
--- a/src/org/scada_lts/web/mvc/api/SystemSettingsAPI.java
+++ b/src/org/scada_lts/web/mvc/api/SystemSettingsAPI.java
@@ -1,10 +1,7 @@
 package org.scada_lts.web.mvc.api;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
-import com.serotonin.mango.web.mvc.controller.ControllerUtils;
 import com.serotonin.mango.web.mvc.controller.ScadaLocaleUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -17,10 +14,11 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Controller for SystemSettings page
@@ -34,24 +32,20 @@ public class SystemSettingsAPI {
     private static final Log LOG = LogFactory.getLog(SystemSettingsAPI.class);
 
     private static final String SAVED_MSG = "saved";
+    private final SystemSettingsService systemSettingsService;
 
-    @Resource
-    private SystemSettingsService systemSettingsService;
+    public SystemSettingsAPI(SystemSettingsService systemSettingsService) {
+        this.systemSettingsService = systemSettingsService;
+    }
 
     @RequestMapping(value = "/getSettings", method = RequestMethod.GET)
-    public ResponseEntity<String> getSettings(HttpServletRequest request) {
+    public ResponseEntity<Map<String, Object>> getSettings(HttpServletRequest request) {
         LOG.info("/api/systemSettings/getSettings");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                ObjectMapper mapper = new ObjectMapper();
-                try {
-                    String json = mapper.writeValueAsString(systemSettingsService.getSettings());
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.FORBIDDEN);
-                }
+                Map<String, Object> response = systemSettingsService.getSettings();
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -62,19 +56,13 @@ public ResponseEntity<String> getSettings(HttpServletRequest request) {
     }
 
     @GetMapping(value = "/getDefaultLoggingType", produces = "application/json")
-    public ResponseEntity<String> getLoggingType(HttpServletRequest request) {
+    public ResponseEntity<Map<String, Object>> getLoggingType(HttpServletRequest request) {
         LOG.info("/api/systemSettings/getDefaultLoggingType");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                ObjectMapper mapper = new ObjectMapper();
-                try {
-                    String json = mapper.writeValueAsString(systemSettingsService.getDefaultLoggingType());
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-                }
+                Map<String, Object> response = systemSettingsService.getDefaultLoggingType();
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -192,13 +180,13 @@ public ResponseEntity<String> saveSMSDomainPost(HttpServletRequest request, @Req
     }
 
     @GetMapping(value = "/sendTestEmail", produces = "application/json")
-    public ResponseEntity<String> sendTestEmail(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> sendTestEmail(HttpServletRequest request) {
         LOG.info("/api/systemSettings/sendTestEmail");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
                 try {
-                    String response = systemSettingsService.sendTestEmail(user);
+                    Map<String, String> response = systemSettingsService.sendTestEmailMap(user);
                     return new ResponseEntity<>(response, HttpStatus.OK);
                 } catch (Exception e) {
                     LOG.error(e);
@@ -314,14 +302,16 @@ public ResponseEntity<String> saveDataRetention(HttpServletRequest request, @Req
     }
 
     @GetMapping(value = "/purgeNow", produces = "application/json")
-    public ResponseEntity<String> purgeNow(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> purgeNow(HttpServletRequest request) {
         LOG.info("/api/systemSettings/purgeData");
         LOG.warn("Purging data!");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 systemSettingsService.purgeNow();
-                return new ResponseEntity<>("{\"status\": \"done\"}", HttpStatus.OK);
+                response.put("status", "done");
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -442,13 +432,14 @@ public ResponseEntity<String> saveSystemInfo(HttpServletRequest request, HttpSer
     }
 
     @GetMapping(value = "/getDatabaseType", produces = "application/json")
-    public ResponseEntity<String> getDatabaseType(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> getDatabaseType(HttpServletRequest request) {
         LOG.info("/api/systemSettings/getDatabaseType");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                String json = "{\"databaseType\":\"" + systemSettingsService.getDatabaseType() + "\"}";
-                return new ResponseEntity<>(json, HttpStatus.OK);
+                Map<String, String> response = new HashMap<>();
+                response.put("databaseType", systemSettingsService.getDatabaseType());
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -476,19 +467,13 @@ public ResponseEntity<String> saveDatabaseType(HttpServletRequest request, @Path
     }
 
     @GetMapping(value = "/getDatabaseSize", produces = "application/json")
-    public ResponseEntity<String> getDatabaseSize(HttpServletRequest request) {
+    public ResponseEntity<Map<String, Object>> getDatabaseSize(HttpServletRequest request) {
         LOG.info("/api/systemSettings/getDatabaseSize");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                ObjectMapper mapper = new ObjectMapper();
-                try {
-                    String json = mapper.writeValueAsString(systemSettingsService.getDatabaseSize());
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
-                }
+                Map<String, Object> response = systemSettingsService.getDatabaseSize();
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -499,14 +484,16 @@ public ResponseEntity<String> getDatabaseSize(HttpServletRequest request) {
     }
 
     @GetMapping(value = "/purgeData", produces = "application/json")
-    public ResponseEntity<String> purgeData(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> purgeData(HttpServletRequest request) {
         LOG.info("/api/systemSettings/purgeData");
         LOG.warn("Purging data!");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
                 systemSettingsService.purgeAllData();
-                return new ResponseEntity<>("{\"status\": \"done\"}", HttpStatus.OK);
+                Map<String, String> response = new HashMap<>();
+                response.put("status", "done");
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -517,13 +504,13 @@ public ResponseEntity<String> purgeData(HttpServletRequest request) {
     }
 
     @GetMapping(value = "/getStartupTime", produces = "application/json")
-    public ResponseEntity<String> getStartupTime(HttpServletRequest request) {
+    public ResponseEntity<Map<String, Object>> getStartupTime(HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                return new ResponseEntity<>(
-                        "{\"startupTime\": \"" + systemSettingsService.getStartupTime() + "\"}",
-                        HttpStatus.OK);
+                Map<String, Object> response = new HashMap<>();
+                response.put("startupTime", systemSettingsService.getStartupTime());
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -534,13 +521,13 @@ public ResponseEntity<String> getStartupTime(HttpServletRequest request) {
     }
 
     @GetMapping(value = "/getSchemaVersion", produces = "application/json")
-    public ResponseEntity<String> getSchemaVersion(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> getSchemaVersion(HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                return new ResponseEntity<>(
-                        "{\"schemaVersion\": \"" + systemSettingsService.getSchemaVersion() + "\"}",
-                        HttpStatus.OK);
+                Map<String, String> response = new HashMap<>();
+                response.put("schemaVersion", systemSettingsService.getSchemaVersion());
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
diff --git a/src/org/scada_lts/web/mvc/api/TranslateAPI.java b/src/org/scada_lts/web/mvc/api/TranslateAPI.java
index dea9032107..903a337698 100644
--- a/src/org/scada_lts/web/mvc/api/TranslateAPI.java
+++ b/src/org/scada_lts/web/mvc/api/TranslateAPI.java
@@ -11,6 +11,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+@Deprecated(since = "2.8.0")
 public class TranslateAPI {
 	
 	private static final Log LOG = LogFactory.getLog(TranslateAPI.class);
diff --git a/src/org/scada_lts/web/mvc/api/UserCommentAPI.java b/src/org/scada_lts/web/mvc/api/UserCommentAPI.java
index 8e2a390c28..a8260fe595 100644
--- a/src/org/scada_lts/web/mvc/api/UserCommentAPI.java
+++ b/src/org/scada_lts/web/mvc/api/UserCommentAPI.java
@@ -6,13 +6,12 @@
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.mango.service.UserCommentService;
 import org.scada_lts.web.beans.ApplicationBeans;
-import org.scada_lts.web.mvc.api.json.JsonEventComment;
+import org.scada_lts.web.mvc.api.json.JsonUserComment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import static org.scada_lts.utils.UserCommentApiUtils.validUserComment;
@@ -35,27 +34,27 @@ public UserCommentAPI() {
      * Create User Comment
      *
      * @param request HTTP request
-     * @param body String comment
+     * @param createUserComment String comment
      * @param typeId UserComment type (1 - Event or 2 - Point)
      * @param refId Reference ID of the object
      *
      * @return Status
      */
     @PostMapping(value = "/{typeId}/{refId}")
-    public ResponseEntity<String> createUserComment(HttpServletRequest request, @RequestBody JsonEventComment comment, @PathVariable("typeId") Integer typeId, @PathVariable("refId") Integer refId) {
+    public ResponseEntity<?> createUserComment(HttpServletRequest request, @RequestBody CreateUserComment createUserComment, @PathVariable("typeId") Integer typeId, @PathVariable("refId") Integer refId) {
         try {
             User user = Common.getUser(request);
             if(user != null) {
-                String error = validUserComment(typeId, refId, comment.getCommentText());
+                String error = validUserComment(typeId, refId, createUserComment.getCommentText());
                 if (!error.isEmpty()) {
                     return ResponseEntity.badRequest().body(formatErrorsJson(error));
                 }
-                int result = userCommentService.setUserComment(comment.getCommentText(), typeId, refId, user);
-                if(result != 0) {
-                    return new ResponseEntity<>(String.valueOf(result), HttpStatus.CREATED);
-                } else {
-                    return new ResponseEntity<>(String.valueOf(result), HttpStatus.BAD_REQUEST);
-                }
+                return userCommentService.addUserComment(createUserComment.getCommentText(), typeId, refId, user).map(a -> {
+                            JsonUserComment comment = new JsonUserComment(a.getUserId(), typeId, a.getTypeKey(),
+                                    a.getTs(), a.getComment(), a.getUsername(), a.getPrettyTime());
+                            return new ResponseEntity<>(comment, HttpStatus.CREATED);
+                        })
+                        .orElseGet(() -> new ResponseEntity<>(HttpStatus.BAD_REQUEST));
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -97,4 +96,23 @@ public ResponseEntity<String> deleteUserComment(HttpServletRequest request, @Pat
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
+
+    static class CreateUserComment {
+        private String commentText;
+
+        public CreateUserComment() {
+        }
+
+        public CreateUserComment(String commentText) {
+            this.commentText = commentText;
+        }
+
+        public String getCommentText() {
+            return commentText;
+        }
+
+        public void setCommentText(String commentText) {
+            this.commentText = commentText;
+        }
+    }
 }
diff --git a/src/org/scada_lts/web/mvc/api/UtilsAPI.java b/src/org/scada_lts/web/mvc/api/UtilsAPI.java
index 4dd29641b4..b90af0e40f 100644
--- a/src/org/scada_lts/web/mvc/api/UtilsAPI.java
+++ b/src/org/scada_lts/web/mvc/api/UtilsAPI.java
@@ -17,7 +17,6 @@
  */
 package org.scada_lts.web.mvc.api;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
@@ -28,7 +27,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * Controller for API watchList
@@ -40,22 +38,22 @@ public class UtilsAPI {
 	
 	private static final Log LOG = LogFactory.getLog(UtilsAPI.class);
 
-	@Resource
-	private UtilsService utilsService;
+	private final UtilsService utilsService;
+
+	public UtilsAPI(UtilsService utilsService) {
+		this.utilsService = utilsService;
+	}
 
 	@RequestMapping(value = "/api/utils/getTs", method = RequestMethod.GET)
 	public ResponseEntity<String> getTs(HttpServletRequest request) {
 		LOG.info("/api/utils/getTs");
 		try {
-			String json = null;
-			ObjectMapper mapper = new ObjectMapper();
-			json = mapper.writeValueAsString(utilsService.getTS());
-				
-			return new ResponseEntity<String>(json,HttpStatus.OK);				
+			long ts = utilsService.getTS();
+			return new ResponseEntity<>(String.valueOf(ts),HttpStatus.OK);
 
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 	}
 }
diff --git a/src/org/scada_lts/web/mvc/api/ViewAPI.java b/src/org/scada_lts/web/mvc/api/ViewAPI.java
index f68470e5fe..7d14cb9d56 100644
--- a/src/org/scada_lts/web/mvc/api/ViewAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ViewAPI.java
@@ -17,8 +17,8 @@
  */
 package org.scada_lts.web.mvc.api;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.view.ImageSet;
 import com.serotonin.mango.view.View;
 import com.serotonin.mango.vo.User;
@@ -39,7 +39,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.Serializable;
@@ -86,101 +85,36 @@ public ResponseEntity<List<ScadaObjectIdentifier>> getAll(HttpServletRequest req
     }
 
     @RequestMapping(value = "/getModificationTime/{id}", method = RequestMethod.GET)
-    public ResponseEntity<String> getModificationTime(@PathVariable("id") Integer id, HttpServletRequest request) {
+    public ResponseEntity<ViewJSON> getModificationTime(@PathVariable("id") Integer id, HttpServletRequest request) {
         LOG.info("/api/view/getModificationTime/{id} id:"+id);
 
         try {
             User user = Common.getUser(request);
 
             if (user != null) {
-                class ViewJSON implements Serializable {
-                    private long id;
-                    private long mtime;
-
-                    ViewJSON(long id, long mtime) {
-                        this.setId(id);
-                        this.setMtime(mtime);
-                    }
-
-                    public long getId() {
-                        return id;
-                    }
-
-                    public void setId(long id) {
-                        this.id = id;
-                    }
-
-                    public long getMtime() {
-                        return mtime;
-                    }
-
-                    public void setMtime(long mtime) {
-                        this.mtime = mtime;
-                    }
-                }
 
                 View view = viewService.getView(id);
-
                 ViewJSON viewJSON = new ViewJSON(view.getId(), view.getModificationTime());
-
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-                json = mapper.writeValueAsString(viewJSON);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(viewJSON, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
     @Deprecated
     @RequestMapping(value = "/getByXid/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getByXid(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<ViewJSON> getByXid(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/view/getByXid/{xid} xid:"+xid);
 
         try {
             User user = Common.getUser(request);
 
             if (user != null) {
-                class ViewJSON implements Serializable {
-                    private long id;
-                    private String xid;
-                    private long mtime;
-
-                    ViewJSON(long id, String xid, long mtime) {
-                        this.setId(id);
-                        this.setXid(xid);
-                        this.setMtime(mtime);
-                    }
 
-                    public long getId() {
-                        return id;
-                    }
-
-                    public void setId(long id) {
-                        this.id = id;
-                    }
-
-                    public String getXid() {
-                        return xid;
-                    }
-
-                    public void setXid(String xid) {
-                        this.xid = xid;
-                    }
-
-                    public long getMtime() {
-                        return mtime;
-                    }
-
-                    public void setMtime(long mtime) {
-                        this.mtime = mtime;
-                    }
-                }
 
                 View view;
                 if (user.isAdmin()) {
@@ -189,14 +123,8 @@ public void setMtime(long mtime) {
                     return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
                 }
 
-
                 ViewJSON viewJSON = new ViewJSON(view.getId(), view.getXid(), view.getModificationTime());
-
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-                json = mapper.writeValueAsString(viewJSON);
-
-                return new ResponseEntity<>(json, HttpStatus.OK);
+                return new ResponseEntity<>(viewJSON, HttpStatus.OK);
             }
 
             return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -208,78 +136,21 @@ public void setMtime(long mtime) {
 
     @Deprecated
     @RequestMapping(value = "/createView", method = RequestMethod.POST)
-    public ResponseEntity<String> createView(HttpServletRequest request, @RequestBody ViewDTO viewDTO) {
+    public ResponseEntity<ViewJSON> createView(HttpServletRequest request, @RequestBody ViewDTO viewDTO) {
         LOG.info("/api/view/createView");
 
-        ResponseEntity<String> result;
+        ResponseEntity<ViewJSON> result;
         ViewDTOValidator validator = new ViewDTOValidator();
 
         BindException errors = new BindException(viewDTO, "viewDTO");
         validator.validate(viewDTO, errors);
 
-
         try {
-            class ViewJSON implements Serializable {
-                private static final long serialVersionUID = 8076556272526329317L;
-                private String name;
-                private String xid;
-                private int userId;
-                private int resolution;
-                private String filename;
-
-                public ViewJSON(String name, String xid, int userId, int resolution, String filename) {
-                    this.name = name;
-                    this.xid = xid;
-                    this.userId = userId;
-                    this.resolution = resolution;
-                    this.filename = filename;
-                }
-
-                public String getName() {
-                    return name;
-                }
-
-                public void setName(String name) {
-                    this.name = name;
-                }
-
-                public String getXid() {
-                    return xid;
-                }
-
-                public void setXid(String xid) {
-                    this.xid = xid;
-                }
-
-                public int getUserId() {
-                    return userId;
-                }
-
-                public void setUserId(int userId) {
-                    this.userId = userId;
-                }
-
-                public int getResolution() {
-                    return resolution;
-                }
-
-                public void setResolution(int resolution) {
-                    this.resolution = resolution;
-                }
-
-                public String getFilename() {
-                    return filename;
-                }
-
-                public void setFilename(String filename) {
-                    this.filename = filename;
-                }
-            }
 
             User user = Common.getUser(request);
 
             if (!errors.hasErrors()) {
-                if (user.isAdmin()) {
+                if (user != null && user.isAdmin()) {
 
                     View view = new View();
                     view.setName(viewDTO.getName());
@@ -294,8 +165,6 @@ public void setFilename(String filename) {
 
                     viewService.saveView(view);
 
-                    ObjectMapper mapper = new ObjectMapper();
-                    String json = null;
                     ViewJSON viewJSON = new ViewJSON(
                             view.getName(),
                             view.getXid(),
@@ -304,19 +173,17 @@ public void setFilename(String filename) {
                             view.getBackgroundFilename()
                     );
 
-                    json = mapper.writeValueAsString(viewJSON);
-
-                    result = new ResponseEntity<String>(json, HttpStatus.OK);
+                    result = new ResponseEntity<>(viewJSON, HttpStatus.OK);
                 } else {
-                    result = new ResponseEntity<String>("Acces unauthorized, logged user has no admin permissions ",HttpStatus.UNAUTHORIZED);
+                    result = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
                 }
             } else {
-                result = new ResponseEntity<String>("Invalid arguments in JSON file " , HttpStatus.UNPROCESSABLE_ENTITY);
+                result = new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
             }
 
         } catch (Exception e) {
             LOG.error(e);
-            result = new ResponseEntity<String>("Something went wrong ",HttpStatus.BAD_REQUEST);
+            result = new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
         return result;
 
@@ -397,14 +264,16 @@ public ResponseEntity<Map<String, String>> createView(@RequestBody GraphicalView
     }
 
     @PutMapping(value = "")
-    public ResponseEntity<String> updateView(@RequestBody GraphicalViewDTO viewDTO, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> updateView(@RequestBody GraphicalViewDTO viewDTO, HttpServletRequest request) {
         LOG.info("/api/view");
         try {
             User user = Common.getUser(request);
             if (user != null) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateGraphicalViewUpdate(viewDTO, user);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 return findAndUpdateView(viewDTO, user);
             } else {
@@ -549,26 +418,101 @@ public ResponseEntity<Map<String, Object>> isXidUnique(
         }
     }
 
-    private ResponseEntity<String> findAndUpdateView(GraphicalViewDTO body, User user) {
+    private ResponseEntity<Map<String, String>> findAndUpdateView(GraphicalViewDTO body, User user) {
+        Map<String, String> errors = new HashMap<>();
+        errors.put("errors", "View not found");
         return getGraphicalView(body.getId(), viewService)
                 .filter(a -> GetViewsWithAccess.hasViewOwnerPermission(user, a))
                 .map(toUpdate -> updateGraphicalView(toUpdate, body, user)).
-                orElse(new ResponseEntity<>(formatErrorsJson("View not found"), HttpStatus.NOT_FOUND));
+                orElse(new ResponseEntity<>(errors, HttpStatus.NOT_FOUND));
     }
 
-    private ResponseEntity<String> updateGraphicalView(View toUpdate, GraphicalViewDTO body, User user) {
+    private ResponseEntity<Map<String, String>> updateGraphicalView(View toUpdate, GraphicalViewDTO body, User user) {
+        Map<String, String> response = new HashMap<>();
         if (isXidChanged(toUpdate.getXid(), body.getXid()) &&
                 isViewPresent(body.getXid(), viewService)){
-            return new ResponseEntity<>(formatErrorsJson("This XID is already in use"), HttpStatus.BAD_REQUEST);
+            response.put("errors", "This XID is already in use");
+            return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
         }
         updateValueGraphicalView(toUpdate, body, user);
         try {
             viewService.saveViewAPI(toUpdate);
         } catch (IOException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>("Saving failed", HttpStatus.INTERNAL_SERVER_ERROR);
+            LOG.error(LoggingUtils.exceptionInfo(e));
+            response.put("errors", "Saving failed");
+            return new ResponseEntity<>(response, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        return new ResponseEntity<>("{\"status\":\"updated\"}", HttpStatus.OK);
+        response.put("status", "updated");
+        return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
+    static class ViewJSON implements Serializable {
+        private static final long serialVersionUID = 8076556272526329317L;
+        private String name;
+        private long id;
+        private String xid;
+        private int userId;
+        private int resolution;
+        private String filename;
+        private long mtime;
+
+        ViewJSON(long id, long mtime) {
+            this.id = id;
+            this.mtime = mtime;
+        }
+
+        ViewJSON(long id, String xid, long mtime) {
+            this.id = id;
+            this.xid = xid;
+            this.mtime = mtime;
+        }
+
+        public ViewJSON(String name, String xid, int userId, int resolution, String filename) {
+            this.name = name;
+            this.xid = xid;
+            this.userId = userId;
+            this.resolution = resolution;
+            this.filename = filename;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getXid() {
+            return xid;
+        }
+
+        public void setXid(String xid) {
+            this.xid = xid;
+        }
+
+        public int getUserId() {
+            return userId;
+        }
+
+        public void setUserId(int userId) {
+            this.userId = userId;
+        }
+
+        public int getResolution() {
+            return resolution;
+        }
+
+        public void setResolution(int resolution) {
+            this.resolution = resolution;
+        }
+
+        public String getFilename() {
+            return filename;
+        }
+
+        public void setFilename(String filename) {
+            this.filename = filename;
+        }
+    }
 }
diff --git a/src/org/scada_lts/web/mvc/api/ViewComponentAPI.java b/src/org/scada_lts/web/mvc/api/ViewComponentAPI.java
index 36a64837a4..312df38d6e 100644
--- a/src/org/scada_lts/web/mvc/api/ViewComponentAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ViewComponentAPI.java
@@ -1,7 +1,6 @@
 package org.scada_lts.web.mvc.api;
 
 import br.org.scadabr.view.component.LinkComponent;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.view.ImageSet;
 import com.serotonin.mango.view.View;
@@ -20,7 +19,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,17 +32,19 @@ public class ViewComponentAPI {
 
     private static final Log LOG = LogFactory.getLog(ViewComponentAPI.class);
 
-    @Resource
-    ViewService viewService;
+    private final ViewService viewService;
+    private final DataPointService dataPointService;
 
-    @Resource
-    DataPointService dataPointService;
+    public ViewComponentAPI(ViewService viewService, DataPointService dataPointService) {
+        this.viewService = viewService;
+        this.dataPointService = dataPointService;
+    }
 
     @RequestMapping(value = "/api/component/getAllComponentsFromView/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getAllComponentsFromView(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<List<ViewComponentDTO>> getAllComponentsFromView(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/component/addComponentToView/{xid} xid:" + xid);
 
-        ResponseEntity<String> result;
+        ResponseEntity<List<ViewComponentDTO>> result;
 
         try {
             User user = Common.getUser(request);
@@ -60,17 +60,13 @@ public ResponseEntity<String> getAllComponentsFromView(@PathVariable("xid") Stri
                     ViewComponentDTO viewComponentDTO = new ViewComponentDTO(vc.getId(), vc.getIndex(), vc.getDefName(), vc.getIdSuffix(), vc.getStyle(), vc.getX(), vc.getY());
                     viewComponentDTOList.add(viewComponentDTO);
                 }
-
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-                json = mapper.writeValueAsString(viewComponentDTOList);
-                result = new ResponseEntity<String>(json, HttpStatus.OK);
+                result = new ResponseEntity<>(viewComponentDTOList, HttpStatus.OK);
             } else {
-                result = new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+                result = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
         } catch (Exception e) {
             LOG.error(e);
-            result = new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            result = new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
 
         return result;
diff --git a/src/org/scada_lts/web/mvc/api/ViewHierarchyAPI.java b/src/org/scada_lts/web/mvc/api/ViewHierarchyAPI.java
index 9ceb4946ae..84eadb4853 100644
--- a/src/org/scada_lts/web/mvc/api/ViewHierarchyAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ViewHierarchyAPI.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
@@ -32,6 +31,7 @@
 import org.scada_lts.dao.model.viewshierarchy.ViewHierarchyNode;
 import org.scada_lts.service.ViewHierarchyService;
 import org.scada_lts.service.model.ViewHierarchyJSON;
+import org.scada_lts.web.mvc.api.exceptions.BadRequestException;
 import org.springframework.context.MessageSource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -40,7 +40,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 
@@ -53,42 +52,38 @@
 public class ViewHierarchyAPI {
 	
 	private static final Log LOG = LogFactory.getLog(ViewHierarchyAPI.class);
-	
-	@Resource
-	private ViewHierarchyService viewHierarchyService;
-	
-	@Resource
-	private MessageSource msgSource;
 
-	
+	private final ViewHierarchyService viewHierarchyService;
+	private final MessageSource msgSource;
+
+	public ViewHierarchyAPI(ViewHierarchyService viewHierarchyService, MessageSource msgSource) {
+		this.viewHierarchyService = viewHierarchyService;
+		this.msgSource = msgSource;
+	}
+
 	@RequestMapping(value = "/api/view_hierarchy/getAll", method = RequestMethod.GET)
-	public ResponseEntity<String> getAll(HttpServletRequest request) {
+	public ResponseEntity<List<ViewHierarchyJSON>> getAll(HttpServletRequest request) {
 		LOG.info("/api/view_hierarchy/getAll");
 		try {
 			User user = Common.getUser(request);
 		
 			if (user != null) {
 				List<ViewHierarchyJSON> data = ViewHierarchyCache.getInstance().getAll();
-				String json = null;
-				ObjectMapper mapper = new ObjectMapper();
-				
-				json = mapper.writeValueAsString(data);
-				
-				return new ResponseEntity<String>(json,HttpStatus.OK);				
+				return new ResponseEntity<>(data,HttpStatus.OK);
 			} 
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 			
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(e.toString(), HttpStatus.BAD_REQUEST);
+			throw new BadRequestException(e.toString(), request.getRequestURI());
 		}
 	}
 	
 		
 	
 	@RequestMapping(value = "/api/view_hierarchy/createFolder/{name}/{parentId}", method = RequestMethod.GET)
-	public ResponseEntity<String> createFolder(@PathVariable("name") String name, @PathVariable("parentId") int parentId, HttpServletRequest request) {
+	public ResponseEntity<Object> createFolder(@PathVariable("name") String name, @PathVariable("parentId") int parentId, HttpServletRequest request) {
 		
 		LOG.info("/api/view_hierarchy/createFolder/{name}:"+name+" {parentId}:"+parentId);
 		
@@ -99,14 +94,9 @@ public ResponseEntity<String> createFolder(@PathVariable("name") String name, @P
 					ViewHierarchyNode node = new ViewHierarchyNode(parentId, name);
 					viewHierarchyService.add(node);
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString(node);
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>(node,HttpStatus.OK);
 				} catch ( Exception error) {
 					LOG.error(error);
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
 					ViewError er = new ViewError();
 					
 					ParseErrorResult per = ParseError.getError(error.getLocalizedMessage());
@@ -117,21 +107,20 @@ public ResponseEntity<String> createFolder(@PathVariable("name") String name, @P
 						errStr = per.getMessage();
 					}
 					er.setMessage(errStr);
-					json = mapper.writeValueAsString(er);
-					return new ResponseEntity<String>(json,HttpStatus.BAD_REQUEST);
+					return new ResponseEntity<>(er,HttpStatus.BAD_REQUEST);
 				} 
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 			
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 	}
 	
 	@RequestMapping(value = "/api/view_hierarchy/editFolder/{name}/{key}", method = RequestMethod.GET)
-	public ResponseEntity<String> editFolder(@PathVariable("name") String name, @PathVariable("key") int key, HttpServletRequest request) {
+	public ResponseEntity<ViewHierarchyNode> editFolder(@PathVariable("name") String name, @PathVariable("key") int key, HttpServletRequest request) {
 		
 		LOG.info("/api/view_hierarchy/editFolder/{name}:"+name+" {key}:"+key);
 		
@@ -144,19 +133,16 @@ public ResponseEntity<String> editFolder(@PathVariable("name") String name, @Pat
 				
 				if (viewHierarchyService.edt(node)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString(node);
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>(node,HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 			
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 	}
 	
@@ -171,19 +157,16 @@ public ResponseEntity<String> deleteFolder(@PathVariable("id") int id, HttpServl
 				
 				if (viewHierarchyService.delFolder(id)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString("success");
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>("success",HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 		
 	}
@@ -199,19 +182,16 @@ public ResponseEntity<String> deleteView(@PathVariable("id") int id, HttpServlet
 				
 				if (viewHierarchyService.delView(id)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString("success");
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>("success",HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 		
 	}
@@ -227,15 +207,12 @@ public ResponseEntity<String> moveFolder(@PathVariable("id") int id, @PathVariab
 				
 				if (viewHierarchyService.moveFolder(id, newParentId)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString("moved");
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>("moved",HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
@@ -255,42 +232,38 @@ public ResponseEntity<String> moveView(@PathVariable("id") int id, @PathVariable
 				
 				if (viewHierarchyService.moveView(id, newParentId)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString("moved");
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>("moved",HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 		
 	}
 	
 	@RequestMapping(value = "/api/view_hierarchy/getFirstViewId", method = RequestMethod.GET)
-	public ResponseEntity<String> getFirstViewId(HttpServletRequest request) {
+	public ResponseEntity<ViewHierarchyJSON> getFirstViewId(HttpServletRequest request) {
 		
 		LOG.info("/api/view_hierarchy/getFirstViewId");
 		
 		try {
 			User user = Common.getUser(request);
 			if (user != null) {
-				String json = null;
-				ObjectMapper mapper = new ObjectMapper();
-				json = mapper.writeValueAsString(viewHierarchyService.getFirstViewId());
-				return new ResponseEntity<String>(json,HttpStatus.OK);
+
+				ViewHierarchyJSON response = viewHierarchyService.getFirstViewId();
+				return new ResponseEntity<>(response,HttpStatus.OK);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 		
 	}
diff --git a/src/org/scada_lts/web/mvc/api/components/AmChartValuesAPI.java b/src/org/scada_lts/web/mvc/api/components/AmChartValuesAPI.java
index 02013b82d7..b2ca78245d 100644
--- a/src/org/scada_lts/web/mvc/api/components/AmChartValuesAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/AmChartValuesAPI.java
@@ -29,8 +29,13 @@
 public class AmChartValuesAPI {
     private static final Log LOG = LogFactory.getLog(AmChartValuesAPI.class);
 
-    private static final DataPointService dpService = new DataPointService();
-    private static final SystemSettingsService systemSettingsService = new SystemSettingsService();
+    private final DataPointService dpService;
+    private final SystemSettingsService systemSettingsService;
+
+    public AmChartValuesAPI(DataPointService dpService, SystemSettingsService systemSettingsService) {
+        this.dpService = dpService;
+        this.systemSettingsService = systemSettingsService;
+    }
 
     @GetMapping("/")
     public ResponseEntity<List<Map<String, Double>>> getValuesFromTimeRange(
diff --git a/src/org/scada_lts/web/mvc/api/components/cmp/ChangeDataAPI.java b/src/org/scada_lts/web/mvc/api/components/cmp/ChangeDataAPI.java
index 1724b2956d..1878499b49 100644
--- a/src/org/scada_lts/web/mvc/api/components/cmp/ChangeDataAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/cmp/ChangeDataAPI.java
@@ -6,10 +6,8 @@
 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.PointValueService;
 import org.scada_lts.service.MultiChangesHistoryService;
 import org.scada_lts.web.mvc.api.components.cmp.model.SetValuePointDTO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -18,7 +16,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -28,15 +25,13 @@
 public class ChangeDataAPI {
     private static final Log LOG = LogFactory.getLog(ChangeDataAPI.class);
 
-    @Autowired
-    private DataPointService dataPointService;
-
-    @Resource
-    private PointValueService pointValueService;
-
-    @Resource
-    private MultiChangesHistoryService multiChangesHistoryService;
+    private final DataPointService dataPointService;
+    private final MultiChangesHistoryService multiChangesHistoryService;
 
+    public ChangeDataAPI(DataPointService dataPointService, MultiChangesHistoryService multiChangesHistoryService) {
+        this.dataPointService = dataPointService;
+        this.multiChangesHistoryService = multiChangesHistoryService;
+    }
 
     @RequestMapping(value = "/api/cmp/set/{xIdViewAndIdCmp}/{interpretedState}", method = RequestMethod.POST)
     public ResponseEntity<SetValuePointDTO[]> set(
diff --git a/src/org/scada_lts/web/mvc/api/components/cmp/GetHistoryChangesAPI.java b/src/org/scada_lts/web/mvc/api/components/cmp/GetHistoryChangesAPI.java
index e9cc269068..cfd67d777b 100644
--- a/src/org/scada_lts/web/mvc/api/components/cmp/GetHistoryChangesAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/cmp/GetHistoryChangesAPI.java
@@ -13,7 +13,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -23,9 +22,12 @@
 public class GetHistoryChangesAPI {
     private static final Log LOG = LogFactory.getLog(GetHistoryChangesAPI.class);
 
-    @Resource
     private MultiChangesHistoryService multiChangesHistoryService;
 
+    public GetHistoryChangesAPI(MultiChangesHistoryService multiChangesHistoryService) {
+        this.multiChangesHistoryService = multiChangesHistoryService;
+    }
+
     @RequestMapping(value = "/api/cmp/history/{xIdViewAndIdCmp}", method = RequestMethod.GET)
     public ResponseEntity<MultiChangeHistoryComponentDTO> getHistory(@PathVariable(name = "xIdViewAndIdCmp") String xidViewAndIdCmp, HttpServletRequest request) {
         LOG.info("/api/cmp/hisotry xidViewAndIdCmp:" + xidViewAndIdCmp);
diff --git a/src/org/scada_lts/web/mvc/api/components/cmp/ReadDataBaseXIdAPI.java b/src/org/scada_lts/web/mvc/api/components/cmp/ReadDataBaseXIdAPI.java
index 0561d79637..ffd0cfe1a0 100644
--- a/src/org/scada_lts/web/mvc/api/components/cmp/ReadDataBaseXIdAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/cmp/ReadDataBaseXIdAPI.java
@@ -16,7 +16,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,9 +29,13 @@ public class ReadDataBaseXIdAPI {
 
     private static final Log LOG = LogFactory.getLog(ReadDataBaseXIdAPI.class);
 
-    private DataPointService dataPointService = new DataPointService();
-    @Resource
-    private PointValueService pointValueService;
+    private final DataPointService dataPointService;
+    private final PointValueService pointValueService;
+
+    public ReadDataBaseXIdAPI(DataPointService dataPointService, PointValueService pointValueService) {
+        this.dataPointService = dataPointService;
+        this.pointValueService = pointValueService;
+    }
 
     @RequestMapping(value = "/api/cmp/get/{xIDs}", method = RequestMethod.GET)
     public ResponseEntity<List<ReadValuePointDTO>> get(@PathVariable(name = "xIDs") String[] xIDs, HttpServletRequest request) {
diff --git a/src/org/scada_lts/web/mvc/api/components/synoptic_panel/SynopticPanelAPI.java b/src/org/scada_lts/web/mvc/api/components/synoptic_panel/SynopticPanelAPI.java
index f9633ecd69..6044b97847 100644
--- a/src/org/scada_lts/web/mvc/api/components/synoptic_panel/SynopticPanelAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/synoptic_panel/SynopticPanelAPI.java
@@ -5,18 +5,18 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.dao.model.ScadaObjectIdentifier;
+import org.scada_lts.serorepl.utils.StringUtils;
 import org.scada_lts.service.SynopticPanelService;
 import org.scada_lts.service.model.SynopticPanel;
+import org.scada_lts.utils.ValidationUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Controller for Synoptic Panels
@@ -33,8 +33,11 @@ public class SynopticPanelAPI {
 
     private static final Log LOG = LogFactory.getLog(SynopticPanelAPI.class);
 
-    @Resource
-    private SynopticPanelService synopticPanelService;
+    private final SynopticPanelService synopticPanelService;
+
+    public SynopticPanelAPI(SynopticPanelService synopticPanelService) {
+        this.synopticPanelService = synopticPanelService;
+    }
 
     /**
      * Use universal ScadaObjectIdentifier Class
@@ -97,7 +100,12 @@ public ResponseEntity<SynopticPanel> createSynopticPanel(HttpServletRequest requ
         try {
             User user = Common.getUser(request);
             if(user != null) {
-                return new ResponseEntity<>(synopticPanelService.createSynopticPanel(requestBody), HttpStatus.CREATED);
+                String error = ValidationUtils.validSvg(requestBody.getVectorImage());
+                if(!StringUtils.isEmpty(error)) {
+                    return ResponseEntity.badRequest().build();
+                }
+                SynopticPanel result = synopticPanelService.createSynopticPanel(requestBody);
+                return new ResponseEntity<>(result, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -112,7 +120,12 @@ public ResponseEntity<SynopticPanel> updateSynopticPanel(HttpServletRequest requ
         try {
             User user = Common.getUser(request);
             if (user != null) {
-                return new ResponseEntity<>(synopticPanelService.updateSynopticPanel(requestBody), HttpStatus.OK);
+                String error = ValidationUtils.validSvg(requestBody.getVectorImage());
+                if(!StringUtils.isEmpty(error)) {
+                    return ResponseEntity.badRequest().build();
+                }
+                SynopticPanel result = synopticPanelService.updateSynopticPanel(requestBody);
+                return new ResponseEntity<>(result, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
diff --git a/src/org/scada_lts/web/mvc/api/css/CssStyle.java b/src/org/scada_lts/web/mvc/api/css/CssStyle.java
new file mode 100644
index 0000000000..a969130d35
--- /dev/null
+++ b/src/org/scada_lts/web/mvc/api/css/CssStyle.java
@@ -0,0 +1,13 @@
+package org.scada_lts.web.mvc.api.css;
+
+public class CssStyle {
+    private final String content;
+
+    public CssStyle(String content) {
+        this.content = content;
+    }
+
+    public String getContent() {
+        return content;
+    }
+}
diff --git a/src/org/scada_lts/web/mvc/api/datasources/meta/MetaController.java b/src/org/scada_lts/web/mvc/api/datasources/meta/MetaController.java
index ba2a536945..07f36c621b 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/meta/MetaController.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/meta/MetaController.java
@@ -7,7 +7,6 @@
 import com.serotonin.mango.rt.dataSource.meta.DataPointStateException;
 import com.serotonin.mango.rt.dataSource.meta.ResultTypeException;
 import com.serotonin.mango.rt.dataSource.meta.ScriptExecutor;
-import com.serotonin.mango.vo.User;
 import com.serotonin.web.i18n.LocalizableMessage;
 import com.serotonin.web.taglib.DateFunctions;
 import org.apache.commons.logging.Log;
diff --git a/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpController.java b/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpController.java
index c67fee9fb4..0a210b3133 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpController.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpController.java
@@ -15,6 +15,7 @@
 import com.serotonin.modbus4j.exception.ModbusTransportException;
 import com.serotonin.modbus4j.ip.IpParameters;
 import com.serotonin.modbus4j.locator.BaseLocator;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -67,7 +68,7 @@ public ResponseEntity<Map<String, Object>> testPointLocator(
         try {
             User user = Common.getUser(request);
             if(user != null) {
-                ObjectMapper mapper = new ObjectMapper();
+                ObjectMapper mapper = ApplicationBeans.getObjectMapper();
                 ModbusIpDataSourceJson ds = mapper.convertValue(data.get("datasource"), ModbusIpDataSourceJson.class);
                 ModbusIpPointLocatorJson pl = mapper.convertValue(data.get("pointLocator"), ModbusIpPointLocatorJson.class);
                 ModbusPointLocatorVO pointLocator = pl.parsePointLocatorData();
diff --git a/src/org/scada_lts/web/mvc/api/dtp/report/DataPointsBaseOnNameFilter.java b/src/org/scada_lts/web/mvc/api/dtp/report/DataPointsBaseOnNameFilter.java
index 2e904c8c9d..545361fc94 100644
--- a/src/org/scada_lts/web/mvc/api/dtp/report/DataPointsBaseOnNameFilter.java
+++ b/src/org/scada_lts/web/mvc/api/dtp/report/DataPointsBaseOnNameFilter.java
@@ -1,6 +1,5 @@
 package org.scada_lts.web.mvc.api.dtp.report;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
@@ -8,6 +7,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.dao.model.point.PointValue;
 import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.web.mvc.api.dto.PointValueDTO;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -18,6 +18,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +34,7 @@ public class DataPointsBaseOnNameFilter {
     DataPointService dataPointService = new DataPointService();
 
     @RequestMapping(value = "/api/dtp/report/get/{partOfNameDS}/{typeDS}/{partOfNamePoint}/{startTime}/{endTime}", method = RequestMethod.GET)
-    public ResponseEntity<String> get(
+    public ResponseEntity<Map<String, List<PointValueDTO>>> get(
             @PathVariable("partOfNameDS") String partOfNameDS,
             @PathVariable("typeDS") String typeDS,
             @PathVariable("partOfNamePoint") String partOfNamePoint,
@@ -63,29 +64,25 @@ public ResponseEntity<String> get(
                 }
             } catch (Exception e) {
                 LOG.error(e);
-                return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+                return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
             }
 
 
             User user = Common.getUser(request);
 
             if (user != null && user.isAdmin()) {
-
-
                 Map<DataPointVO, List<PointValue>> pointsAndValuesFromRangeTime = dataPointService.getDataPoints(partOfNameDS, typeDS, partOfNamePoint, startTimeDT, endTimeDT);
-                List result = dataPointService.valuesPointBooleanBaseOnNameFilter2DTO(pointsAndValuesFromRangeTime);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-                json = mapper.writeValueAsString(result);
-
-                return new ResponseEntity<String>("{\"data\":"+json+"}", HttpStatus.OK);
+                List<PointValueDTO> result = dataPointService.valuesPointBooleanBaseOnNameFilter2DTO(pointsAndValuesFromRangeTime);
+                Map<String, List<PointValueDTO>> response = new HashMap<>();
+                response.put("data", result);
+                return new ResponseEntity<>(response, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/json/JsonEventComment.java b/src/org/scada_lts/web/mvc/api/json/JsonEventComment.java
deleted file mode 100644
index 6cb48aa253..0000000000
--- a/src/org/scada_lts/web/mvc/api/json/JsonEventComment.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.scada_lts.web.mvc.api.json;
-
-import com.serotonin.mango.Common;
-
-public class JsonEventComment {
-    private int userId;
-    private int commentType;
-    private long typeKey;
-    private long ts;
-    private String commentText;
-    public JsonEventComment() {}
-
-    public JsonEventComment(int userId, int commentType, long typeKey, long ts, String commentText) {
-        this.userId = userId;
-        this.commentType = commentType;
-        this.typeKey = typeKey;
-        this.ts = ts;
-        this.commentText = commentText;
-    }
-
-    public int getUserId() {
-        return userId;
-    }
-
-    public void setUserId(int userId) {
-        this.userId = userId;
-    }
-
-    public int getCommentType() {
-        return commentType;
-    }
-
-    public void setCommentType(int commentType) {
-        this.commentType = commentType;
-    }
-
-    public long getTypeKey() {
-        return typeKey;
-    }
-
-    public void setTypeKey(long typeKey) {
-        this.typeKey = typeKey;
-    }
-
-    public long getTs() {
-        return ts;
-    }
-
-    public void setTs(long ts) {
-        this.ts = ts;
-    }
-
-    public String getCommentText() {
-        return commentText;
-    }
-
-    public void setCommentText(String commentText) {
-        this.commentText = commentText;
-    }
-}
diff --git a/src/org/scada_lts/web/mvc/api/json/JsonUserComment.java b/src/org/scada_lts/web/mvc/api/json/JsonUserComment.java
new file mode 100644
index 0000000000..31af8d06c9
--- /dev/null
+++ b/src/org/scada_lts/web/mvc/api/json/JsonUserComment.java
@@ -0,0 +1,52 @@
+package org.scada_lts.web.mvc.api.json;
+
+public class JsonUserComment {
+    private int userId;
+    private int commentType;
+    private long typeKey;
+    private long ts;
+    private String comment;
+    private String username;
+    private String prettyTime;
+
+    public JsonUserComment() {}
+
+    public JsonUserComment(int userId, int commentType, long typeKey, long ts, String comment,
+                           String username, String prettyTime) {
+        this.userId = userId;
+        this.commentType = commentType;
+        this.typeKey = typeKey;
+        this.ts = ts;
+        this.comment = comment;
+        this.username = username;
+        this.prettyTime = prettyTime;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public int getCommentType() {
+        return commentType;
+    }
+
+    public long getTypeKey() {
+        return typeKey;
+    }
+
+    public long getTs() {
+        return ts;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPrettyTime() {
+        return prettyTime;
+    }
+}
diff --git a/src/org/scada_lts/web/mvc/controller/PointHierarchyController.java b/src/org/scada_lts/web/mvc/controller/PointHierarchyController.java
index 2bf5738682..f799d45e24 100644
--- a/src/org/scada_lts/web/mvc/controller/PointHierarchyController.java
+++ b/src/org/scada_lts/web/mvc/controller/PointHierarchyController.java
@@ -18,9 +18,7 @@
 package org.scada_lts.web.mvc.controller;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -28,10 +26,11 @@
 import com.serotonin.mango.util.DateUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.joda.time.DateTime;
 import org.scada_lts.cache.PointHierarchyCache;
 import org.scada_lts.dao.model.pointhierarchy.PointHierarchyNode;
 import org.scada_lts.service.pointhierarchy.PointHierarchyService;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -40,8 +39,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 
@@ -83,41 +80,33 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 		return new ModelAndView("redirect:/login.htm");
 	}
 
-	@RequestMapping(value = "/pointHierarchy/{key}", method = RequestMethod.GET)
-	public @ResponseBody String getPointHierarchy(@PathVariable("key") int key, HttpServletRequest request) {
+	@RequestMapping(value = "/pointHierarchy/{key}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<List<PointHierarchyNode>> getPointHierarchy(@PathVariable("key") int key, HttpServletRequest request) {
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("/pointHierarchy/{key} key:" + key);
 		}
 		User user = Common.getUser(request);
 		if (user != null && user.isAdmin()) {
-			String json = "";
 			List<PointHierarchyNode> lst = null;
 			try {
 				lst = PointHierarchyCache.getInstance().getOnBaseParentId(key);
 			} catch (Exception e1) {
 				LOG.error(e1);
 			}
-
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(lst);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(lst);
 		} else {
-			return "";
+			return ResponseEntity.ok(new ArrayList<>());
 		}
 	}
 
-	@RequestMapping(value = "/pointHierarchy/del/{parentId}/{key}/{isFolder}", method = RequestMethod.POST)
-	public @ResponseBody String deletePointHierarchy(@PathVariable("parentId") int parentId,
+	@RequestMapping(value = "/pointHierarchy/del/{parentId}/{key}/{isFolder}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<String> deletePointHierarchy(@PathVariable("parentId") int parentId,
 			@PathVariable("key") int key,@PathVariable("isFolder") boolean isFolder, HttpServletRequest request) throws InterruptedException {
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("/pointHierarchy/del/{parentId}/{key} parentId:" + parentId + " key:" + key + " isFolder:"+isFolder);
 		}
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			boolean ok = false;
 			if (isFolder) {
 				try {
@@ -139,21 +128,14 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 			  ok = pointHierarchyService.move(parentId, 0, key, isFolder);
 			}
 
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-			  json = mapper.writeValueAsString(ok);
-			} catch (JsonProcessingException e) {
-			  LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(String.valueOf(ok));
 		} else {
-			return "";
+			return ResponseEntity.ok("");
 		}
 	}
 
-	@RequestMapping(value = "/pointHierarchy/new/{newParentId}/{newTitle}", method = RequestMethod.POST)
-	public @ResponseBody String addPointHierarchy(@PathVariable("newParentId") int newParentId,
+	@RequestMapping(value = "/pointHierarchy/new/{newParentId}/{newTitle}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<String> addPointHierarchy(@PathVariable("newParentId") int newParentId,
 			@PathVariable("newTitle") String newTitle, ModelMap model, HttpServletRequest request)
 			throws IOException, NullPointerException {
 		if (LOG.isTraceEnabled()) {
@@ -161,100 +143,65 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 		}
 
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			int id = pointHierarchyService.add(PointHierarchyCache.ROOT, newTitle);
-			ObjectMapper mapper = new ObjectMapper();
-			String json = "";
-			try {
-				json = mapper.writeValueAsString(id);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(String.valueOf(id));
 		} else {
-			return "";
+			return ResponseEntity.ok("");
 		}
 	}
 
-	@RequestMapping(value = "/pointHierarchy/edit/{parentId}/{key}/{newTitle}", method = RequestMethod.POST)
-	public @ResponseBody String editPointHierarchy(@PathVariable("parentId") int parentId, @PathVariable("key") int key,
+	@RequestMapping(value = "/pointHierarchy/edit/{parentId}/{key}/{newTitle}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<String> editPointHierarchy(@PathVariable("parentId") int parentId, @PathVariable("key") int key,
 			@PathVariable("newTitle") String newTitle, HttpServletRequest request) {
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("/pointHierarchy/edit/{key}/{newTitle} key:" + key + " newTitle:" + newTitle);
 		}
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			boolean ok = pointHierarchyService.edt(parentId, key, newTitle, true);
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(ok);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(String.valueOf(ok));
 		} else {
-			return "";
+			return ResponseEntity.ok("");
 		}
 	}
 
-	@RequestMapping(value = "/pointHierarchy/move/{key}/{oldParentId}/{newParentId}/{isFolder}", method = RequestMethod.POST)
-	public @ResponseBody String movePointHierarchy(@PathVariable("key") int key,
+	@RequestMapping(value = "/pointHierarchy/move/{key}/{oldParentId}/{newParentId}/{isFolder}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<String> movePointHierarchy(@PathVariable("key") int key,
 			@PathVariable("oldParentId") int oldParentId, @PathVariable("newParentId") int newParentId,
 			@PathVariable("isFolder") boolean isFolder, HttpServletRequest request) {
 		LOG.info("/pointHierarchy/move/{key}/{oldParentId}/{newParentId}" + " key:" + key + "" + " oldParentId:"
 				+ oldParentId + "" + " newParentId:" + newParentId + "" + " isFolder:" + isFolder);
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			pointHierarchyService.move(oldParentId, newParentId, key, isFolder);
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(true);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(String.valueOf(true));
 		} else {
-			return "";
+			return ResponseEntity.ok("");
 		}
 	}
 	
-	@RequestMapping(value = "/pointHierarchy/find/{search}/{page}", method = RequestMethod.GET)
-	public @ResponseBody String find(@PathVariable("search") String search, @PathVariable("page") int page, HttpServletRequest request) throws Exception {
+	@RequestMapping(value = "/pointHierarchy/find/{search}/{page}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<List<PointHierarchyNode>> find(@PathVariable("search") String search, @PathVariable("page") int page, HttpServletRequest request) throws Exception {
 		LOG.info("/pointHierarchy/find/{search} search:"+search+" page:"+page);
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			List<PointHierarchyNode> lst = pointHierarchyService.search(search, page);
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(lst);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(lst);
 		} else {
-			return "";
+			return ResponseEntity.ok(new ArrayList<>());
 		}
 	}
 	
-	@RequestMapping(value = "/pointHierarchy/paths/{key}/{isFolder}", method = RequestMethod.GET)
-	public @ResponseBody String find(@PathVariable("key") int key, @PathVariable("isFolder") boolean isFolder, @PathVariable("interval") int interval, HttpServletRequest request) throws Exception {
+	@RequestMapping(value = "/pointHierarchy/paths/{key}/{isFolder}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<List<PointHierarchyNode>> find(@PathVariable("key") int key, @PathVariable("isFolder") boolean isFolder, @PathVariable("interval") int interval, HttpServletRequest request) throws Exception {
 		LOG.info("/pointHierarchy/paths/{key}/{isFolder} key:"+key+" isFolder:"+isFolder+" interval:"+interval);
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			List<PointHierarchyNode> lst = pointHierarchyService.getPaths(key, isFolder);
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(lst);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(lst);
 		} else {
-			return "";
+			return ResponseEntity.ok(new ArrayList<>());
 		}
 	}
 }
diff --git a/src/org/scada_lts/web/security/XssProtectCssStyleSerializer.java b/src/org/scada_lts/web/security/XssProtectCssStyleSerializer.java
new file mode 100644
index 0000000000..6d54c86189
--- /dev/null
+++ b/src/org/scada_lts/web/security/XssProtectCssStyleSerializer.java
@@ -0,0 +1,24 @@
+package org.scada_lts.web.security;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.scada_lts.web.mvc.api.css.CssStyle;
+
+import java.io.IOException;
+
+
+public class XssProtectCssStyleSerializer extends StdSerializer<CssStyle> {
+
+    public XssProtectCssStyleSerializer() {
+        super(CssStyle.class);
+    }
+
+    @Override
+    public void serialize(CssStyle value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+        String content = XssProtectHtmlEscapeUtils.escape(value.getContent());
+        jgen.writeStartObject();
+        jgen.writeStringField("content", content);
+        jgen.writeEndObject();
+    }
+}
\ No newline at end of file
diff --git a/src/org/scada_lts/web/security/XssProtectHtmlEscapeUtils.java b/src/org/scada_lts/web/security/XssProtectHtmlEscapeUtils.java
new file mode 100644
index 0000000000..2391024670
--- /dev/null
+++ b/src/org/scada_lts/web/security/XssProtectHtmlEscapeUtils.java
@@ -0,0 +1,30 @@
+package org.scada_lts.web.security;
+
+import org.springframework.web.util.HtmlUtils;
+
+public final class XssProtectHtmlEscapeUtils {
+
+    private XssProtectHtmlEscapeUtils() {}
+
+    public static String escape(String value) {
+        String content = HtmlUtils.htmlEscape(value);
+        return whiteSpaceHtmlCode(newLineHtmlCode(content));
+    }
+
+    private static String newLineHtmlCode(String content) {
+        if(content.contains("\n")) {
+            return content.replace("\n", "&#10;").replace("\r", "");
+        }
+        return content.replace("\r", "&#13;");
+    }
+
+    private static String whiteSpaceHtmlCode(String content) {
+        return content.replace("\t", "&emsp;")
+                .replace("\u000B","&#11;")
+                .replace("\f", "&#12;")
+                .replace("\u001C", "&#28;")
+                .replace("\u001D", "&#29;")
+                .replace("\u001E", "&#30;")
+                .replace("\u001F", "&#31;");
+    }
+}
diff --git a/src/org/scada_lts/web/security/XssProtectStringSerializer.java b/src/org/scada_lts/web/security/XssProtectStringSerializer.java
new file mode 100644
index 0000000000..e4769903e6
--- /dev/null
+++ b/src/org/scada_lts/web/security/XssProtectStringSerializer.java
@@ -0,0 +1,20 @@
+package org.scada_lts.web.security;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+
+public class XssProtectStringSerializer extends StdSerializer<String> {
+
+    public XssProtectStringSerializer() {
+        super(String.class);
+    }
+
+    @Override
+    public void serialize(String value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+        String content = XssProtectHtmlEscapeUtils.escape(value);
+        jgen.writeString(content);
+    }
+}
\ No newline at end of file
diff --git a/src/org/scada_lts/web/ws/services/EventsServiceWebSocket.java b/src/org/scada_lts/web/ws/services/EventsServiceWebSocket.java
deleted file mode 100644
index dd4fd2121c..0000000000
--- a/src/org/scada_lts/web/ws/services/EventsServiceWebSocket.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.scada_lts.web.ws.services;
-
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.stereotype.Service;
-
-/**
- * Events WebSocket Service
- *
- * WebSocket service for sending a WebSocket messages to subscribers.
- * It is a concrete implementation of AbstractWebSocket.
- * This class will be initialized during @Autowired process.
- *
- * @author Radoslaw Jajko
- * @version 1.1.0
- */
-@Deprecated(since = "2.7.8")
-@Service
-public class EventsServiceWebSocket extends AbstractWebSocket {
-
-    private static final String WS_DESTINATION = "/alarm";
-
-    public EventsServiceWebSocket(SimpMessagingTemplate template) {
-        super(template);
-    }
-
-    public void notifyEventsSubscribers(String message) {
-        sendWebSocketMessage(WS_DESTINATION, message);
-    }
-
-}
diff --git a/test/org/scada_lts/utils/ThreadPoolExecutorConfigSystemSettingsUtilsTest.java b/test/org/scada_lts/utils/ThreadPoolExecutorConfigSystemSettingsUtilsTest.java
index c8c2543ea7..0b39513641 100644
--- a/test/org/scada_lts/utils/ThreadPoolExecutorConfigSystemSettingsUtilsTest.java
+++ b/test/org/scada_lts/utils/ThreadPoolExecutorConfigSystemSettingsUtilsTest.java
@@ -1,12 +1,22 @@
 package org.scada_lts.utils;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.maint.work.AbstractBeforeAfterWorkItem;
 import com.serotonin.mango.rt.maint.work.WorkItemPriority;
 import com.serotonin.mango.web.ContextWrapper;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.quartz.ItemsPerSecond;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import javax.servlet.ServletContext;
 
@@ -18,7 +28,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(Parameterized.class)
+@RunWith(PowerMockRunner.class)
+@PowerMockRunnerDelegate(Parameterized.class)
+@PrepareForTest({ApplicationBeans.class})
+// resources/org/powermock/extensions/configuration.properties is not working
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*",
+        "javax.activation.*", "javax.management.*"})
 public class ThreadPoolExecutorConfigSystemSettingsUtilsTest {
 
 
@@ -56,6 +71,9 @@ public void config() {
         when(servletContext.getRealPath("")).thenReturn("test/");
         when(contextWrapper.getServletContext()).thenReturn(servletContext);
         Common.ctx = contextWrapper;
+        ObjectMapper objectMapper = new ObjectMapper();
+        PowerMockito.mockStatic(ApplicationBeans.class);
+        when(ApplicationBeans.getObjectMapper()).thenReturn(objectMapper);
     }
 
     @Test
diff --git a/test/org/scada_lts/web/security/XssProtectHtmlEscapeUtilsTest.java b/test/org/scada_lts/web/security/XssProtectHtmlEscapeUtilsTest.java
new file mode 100644
index 0000000000..668c8e2d8f
--- /dev/null
+++ b/test/org/scada_lts/web/security/XssProtectHtmlEscapeUtilsTest.java
@@ -0,0 +1,62 @@
+package org.scada_lts.web.security;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@RunWith(Parameterized.class)
+public class XssProtectHtmlEscapeUtilsTest {
+
+    @Parameterized.Parameters(name = "{index}: content: {0}, expected: {1}")
+    public static List<Object[]> data() {
+        List<Object[]> datas = new ArrayList<>();
+
+        datas.add(new Object[] {"\\n - \n", "\\n - &#10;"});
+        datas.add(new Object[] {"\\r - \r", "\\r - &#13;"});
+
+        datas.add(new Object[] {"\\t - \t", "\\t - &emsp;"});
+        datas.add(new Object[] {"\\u000B - \u000B", "\\u000B - &#11;"});
+        datas.add(new Object[] {"\\f - \f", "\\f - &#12;"});
+        datas.add(new Object[] {"\\u001C - \u001C", "\\u001C - &#28;"});
+        datas.add(new Object[] {"\\u001D - \u001D", "\\u001D - &#29;"});
+        datas.add(new Object[] {"\\u001E - \u001E", "\\u001E - &#30;"});
+        datas.add(new Object[] {"\\u001F - \u001F", "\\u001F - &#31;"});
+
+        datas.add(new Object[] {"<script>alert('abc!')</script>", "&lt;script&gt;alert(&#39;abc!&#39;)&lt;/script&gt;"});
+        datas.add(new Object[] {"body {\n" +
+                "\tfont-size: 62.5%;\n" +
+                "}\n" +
+                "\n" +
+                "table {\n" +
+                "\tfont-size: 1em;\n" +
+                "}", "body {&#10;&emsp;font-size: 62.5%;&#10;}&#10;&#10;table {&#10;&emsp;font-size: 1em;&#10;}"});
+        datas.add(new Object[] {"<img src=x onerror=document.location>", "&lt;img src=x onerror=document.location&gt;"});
+        datas.add(new Object[] {"<img src=x onerror=alert(document.location)>", "&lt;img src=x onerror=alert(document.location)&gt;"});
+        datas.add(new Object[] {"alert(document.location)", "alert(document.location)"});
+
+        return datas;
+    }
+
+    private final String content;
+    private final String expected;
+
+    public XssProtectHtmlEscapeUtilsTest(String content, String expected) {
+        this.content = content;
+        this.expected = expected;
+    }
+
+    @Test
+    public void escape() {
+
+        //when
+        String result = XssProtectHtmlEscapeUtils.escape(content);
+
+        //then:
+        Assert.assertEquals(expected, result);
+    }
+}
\ No newline at end of file
diff --git a/webapp-resources/messages_de.properties b/webapp-resources/messages_de.properties
index f55c6d025c..a85ce5aae5 100644
--- a/webapp-resources/messages_de.properties
+++ b/webapp-resources/messages_de.properties
@@ -3323,16 +3323,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
@@ -3354,7 +3354,7 @@ events.assignedBy=Assigned by {0} for {1}
 common.assignee=Assignee
 event.system.assigned=Assigned Event
 event.system.unassigned=Unassigned Event
-event.assign.enabled=Event Assign enabled
-viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+event.assign.enabled=Event Assign Enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee Column
 systemsettings.top.description.prefix = Top description prefix
-systemsettings.top.description = Top description
\ No newline at end of file
+systemsettings.top.description = Top description
diff --git a/webapp-resources/messages_en.properties b/webapp-resources/messages_en.properties
index a90aea84fe..31ff5e7ef3 100644
--- a/webapp-resources/messages_en.properties
+++ b/webapp-resources/messages_en.properties
@@ -3326,16 +3326,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
diff --git a/webapp-resources/messages_es.properties b/webapp-resources/messages_es.properties
index 16858e2245..61e458292a 100644
--- a/webapp-resources/messages_es.properties
+++ b/webapp-resources/messages_es.properties
@@ -3366,16 +3366,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
diff --git a/webapp-resources/messages_fi.properties b/webapp-resources/messages_fi.properties
index a9b4aa4f36..fa177a2c5c 100644
--- a/webapp-resources/messages_fi.properties
+++ b/webapp-resources/messages_fi.properties
@@ -3451,16 +3451,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
diff --git a/webapp-resources/messages_fr.properties b/webapp-resources/messages_fr.properties
index 521befa47e..657e901729 100644
--- a/webapp-resources/messages_fr.properties
+++ b/webapp-resources/messages_fr.properties
@@ -3320,16 +3320,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
diff --git a/webapp-resources/messages_lu.properties b/webapp-resources/messages_lu.properties
index 96c979db52..ea63b5795a 100644
--- a/webapp-resources/messages_lu.properties
+++ b/webapp-resources/messages_lu.properties
@@ -3339,16 +3339,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
diff --git a/webapp-resources/messages_nl.properties b/webapp-resources/messages_nl.properties
index 62d11da959..0153abfa7f 100644
--- a/webapp-resources/messages_nl.properties
+++ b/webapp-resources/messages_nl.properties
@@ -3441,16 +3441,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
diff --git a/webapp-resources/messages_pl.properties b/webapp-resources/messages_pl.properties
index 6012003c3f..92b6fd9d86 100644
--- a/webapp-resources/messages_pl.properties
+++ b/webapp-resources/messages_pl.properties
@@ -3463,16 +3463,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
diff --git a/webapp-resources/messages_pt.properties b/webapp-resources/messages_pt.properties
index 43e66d1c3b..6b342cf8c1 100644
--- a/webapp-resources/messages_pt.properties
+++ b/webapp-resources/messages_pt.properties
@@ -3478,16 +3478,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
diff --git a/webapp-resources/messages_ru.properties b/webapp-resources/messages_ru.properties
index fd9cc6d1bc..08354fc692 100644
--- a/webapp-resources/messages_ru.properties
+++ b/webapp-resources/messages_ru.properties
@@ -3474,16 +3474,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API
diff --git a/webapp-resources/messages_zh.properties b/webapp-resources/messages_zh.properties
index 8a00ec0928..a8bb2228b4 100644
--- a/webapp-resources/messages_zh.properties
+++ b/webapp-resources/messages_zh.properties
@@ -3426,16 +3426,16 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
-annotation.unknown=Unknow
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
+annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
 annotation.api=REST API