diff --git a/application/src/main/data/json/system/scada_symbols/cylindrical-tank.svg b/application/src/main/data/json/system/scada_symbols/cylindrical-tank.svg
index 1dc50763e4..104b7bc864 100644
--- a/application/src/main/data/json/system/scada_symbols/cylindrical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/cylindrical-tank.svg
@@ -24,7 +24,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*900; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*900; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/elevated-tank.svg b/application/src/main/data/json/system/scada_symbols/elevated-tank.svg
index b3cf71bdda..7874e627df 100644
--- a/application/src/main/data/json/system/scada_symbols/elevated-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/elevated-tank.svg
@@ -24,7 +24,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.transparent) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*895; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.transparent) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*895; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-tank.svg b/application/src/main/data/json/system/scada_symbols/horizontal-tank.svg
index c504f0303b..02832fdce1 100644
--- a/application/src/main/data/json/system/scada_symbols/horizontal-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-tank.svg
@@ -24,7 +24,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*568; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*568; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/large-cylindrical-tank.svg b/application/src/main/data/json/system/scada_symbols/large-cylindrical-tank.svg
index 4773147dff..33dcc947ba 100644
--- a/application/src/main/data/json/system/scada_symbols/large-cylindrical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/large-cylindrical-tank.svg
@@ -24,7 +24,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*910; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*910; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/large-stand-cylindrical-tank.svg b/application/src/main/data/json/system/scada_symbols/large-stand-cylindrical-tank.svg
index ef365ab465..89b72339c2 100644
--- a/application/src/main/data/json/system/scada_symbols/large-stand-cylindrical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/large-stand-cylindrical-tank.svg
@@ -25,7 +25,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*910; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*910; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/large-stand-vertical-tank.svg b/application/src/main/data/json/system/scada_symbols/large-stand-vertical-tank.svg
index d38164a814..7e5170b582 100644
--- a/application/src/main/data/json/system/scada_symbols/large-stand-vertical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/large-stand-vertical-tank.svg
@@ -25,7 +25,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*763; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*763; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/large-vertical-tank.svg b/application/src/main/data/json/system/scada_symbols/large-vertical-tank.svg
index 0387e160ad..5958836557 100644
--- a/application/src/main/data/json/system/scada_symbols/large-vertical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/large-vertical-tank.svg
@@ -24,7 +24,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*763; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*763; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/pool.svg b/application/src/main/data/json/system/scada_symbols/pool.svg
index a0eab2be0b..86bf0d5907 100644
--- a/application/src/main/data/json/system/scada_symbols/pool.svg
+++ b/application/src/main/data/json/system/scada_symbols/pool.svg
@@ -24,7 +24,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.transparent) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*740; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.transparent) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*740; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/small-spherical-tank.svg b/application/src/main/data/json/system/scada_symbols/small-spherical-tank.svg
index b42fd2ab5b..0acbbc9f38 100644
--- a/application/src/main/data/json/system/scada_symbols/small-spherical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/small-spherical-tank.svg
@@ -25,7 +25,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*560; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*560; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/spherical-tank.svg b/application/src/main/data/json/system/scada_symbols/spherical-tank.svg
index cf11b61bba..069c54f444 100644
--- a/application/src/main/data/json/system/scada_symbols/spherical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/spherical-tank.svg
@@ -25,7 +25,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*960; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*960; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/stand-cylindrical-tank.svg b/application/src/main/data/json/system/scada_symbols/stand-cylindrical-tank.svg
index f9948bc64b..2b3b3f010f 100644
--- a/application/src/main/data/json/system/scada_symbols/stand-cylindrical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/stand-cylindrical-tank.svg
@@ -25,7 +25,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*900; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*900; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/stand-horizontal-tank.svg b/application/src/main/data/json/system/scada_symbols/stand-horizontal-tank.svg
index 9adfa3fb82..bea10fd317 100644
--- a/application/src/main/data/json/system/scada_symbols/stand-horizontal-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/stand-horizontal-tank.svg
@@ -25,7 +25,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*568; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*568; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/stand-vertical-short-tank.svg b/application/src/main/data/json/system/scada_symbols/stand-vertical-short-tank.svg
index 5c181e46d9..f9dcb3b141 100644
--- a/application/src/main/data/json/system/scada_symbols/stand-vertical-short-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/stand-vertical-short-tank.svg
@@ -26,7 +26,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 245});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*442; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 245 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 245});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*442; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 245 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/stand-vertical-tank.svg b/application/src/main/data/json/system/scada_symbols/stand-vertical-tank.svg
index e7d14a9f23..078f58d810 100644
--- a/application/src/main/data/json/system/scada_symbols/stand-vertical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/stand-vertical-tank.svg
@@ -25,7 +25,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*765; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*765; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-short-tank.svg b/application/src/main/data/json/system/scada_symbols/vertical-short-tank.svg
index 662bdd1bb2..1b1e825d48 100644
--- a/application/src/main/data/json/system/scada_symbols/vertical-short-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-short-tank.svg
@@ -25,7 +25,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 245});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*442; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 245 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 245});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*442; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 245 + height });\n    }\n}\n",
       "actions": null
     },
     {
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-tank.svg b/application/src/main/data/json/system/scada_symbols/vertical-tank.svg
index 258cb590d0..5c3a4561db 100644
--- a/application/src/main/data/json/system/scada_symbols/vertical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-tank.svg
@@ -24,7 +24,7 @@
     },
     {
       "tag": "fluid",
-      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = ctx.svg.defs().findOne('pattern#liquid');\n    if (liquidPattern) {\n        liquidPattern.id(ctx.api.generateElementId());\n        element.fill(liquidPattern);\n    } else {\n        liquidPattern = element.reference('fill');\n    }\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*765; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
+      "stateRenderFunction": "if (!ctx.properties.scale) {\n    element.hide();\n} else {\n    var liquidPattern = element.reference('fill');\n\n    var valueSet = element.remember('valueSet');\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 0});\n        liquidPattern.transform({translateY: 590});\n    }\n\n    var currentVolume = ctx.values.currentVolume; \n    var tankCapacity = ctx.values.tankCapacity; \n\n    var height = currentVolume / tankCapacity;\n    height = Math.max(0, Math.min(1, height))*765; \n    \n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.animate(element, 500).attr({height: height});\n        liquidPattern.animate(500)\n            .transform({ translateY: 590 + height });\n    }\n}\n",
       "actions": null
     },
     {