diff --git a/web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js b/web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js
index d46b61eb..e6cffb0b 100644
--- a/web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js
+++ b/web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js
@@ -103,7 +103,7 @@ const DistributionSystem = ({ setRedirect, setRedirectUrl, t }) => {
 
     setSelectedDistributionSystemID(event.target.value);
     distributionSystemList.forEach((currentItem, index) => {
-      if (currentItem['value'] == event.target.value) {
+      if (currentItem['value'] === event.target.value) {
         setSelectedDistributionSystemName(currentItem['label']);
       }
     });
diff --git a/web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js b/web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js
index ff806a0f..5f509a5f 100644
--- a/web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js
+++ b/web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js
@@ -123,7 +123,7 @@ const EnergyFlowDiagram = ({ setRedirect, setRedirectUrl, t }) => {
     }
 
     energyFlowDiagramData.links.forEach(function (item) {
-      if(item.value == null) {
+      if(typeof item.value === 'null') {
           item.value = 0;
       }
       let sourceColor = null;
diff --git a/web/src/components/MyEMS/AuxiliarySystem/RealtimeChart.js b/web/src/components/MyEMS/AuxiliarySystem/RealtimeChart.js
index 288a93e5..d9d7e6aa 100644
--- a/web/src/components/MyEMS/AuxiliarySystem/RealtimeChart.js
+++ b/web/src/components/MyEMS/AuxiliarySystem/RealtimeChart.js
@@ -72,7 +72,7 @@ class RealtimeChart extends Component {
     //fetch realtime data at regular intervals
     this.refreshInterval = setInterval(() => {
       let isResponseOK = false;
-      if (this.props.distributionSystemID != undefined) {
+      if (typeof this.props.distributionSystemID !== 'undefined') {
         fetch(APIBaseURL + '/reports/distributionsystem?distributionsystemid=' + this.props.distributionSystemID, {
           method: 'GET',
           headers: {
diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js
index f2ad26c7..554c1cd4 100644
--- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js
+++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js
@@ -346,7 +346,7 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => {
 
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js
index 908dc17f..c15269fa 100644
--- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js
+++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js
@@ -343,7 +343,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) =>
         
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Equipment/EquipmentCost.js b/web/src/components/MyEMS/Equipment/EquipmentCost.js
index 71568033..018864e4 100644
--- a/web/src/components/MyEMS/Equipment/EquipmentCost.js
+++ b/web/src/components/MyEMS/Equipment/EquipmentCost.js
@@ -341,7 +341,7 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => {
 
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js b/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js
index faed8b4d..1a2850d3 100644
--- a/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js
+++ b/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js
@@ -340,7 +340,7 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
         
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Meter/RealtimeChart.js b/web/src/components/MyEMS/Meter/RealtimeChart.js
index 37e8a1a1..c0802557 100644
--- a/web/src/components/MyEMS/Meter/RealtimeChart.js
+++ b/web/src/components/MyEMS/Meter/RealtimeChart.js
@@ -6,7 +6,7 @@ import { rgbaColor } from '../../../helpers/utils';
 import { withTranslation } from 'react-i18next';
 import uuid from 'uuid/v1';
 import { APIBaseURL } from '../../../config';
-import { getCookieValue, createCookie } from '../../../helpers/utils';
+import { getCookieValue } from '../../../helpers/utils';
 import { toast } from 'react-toastify';
 
 
diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js b/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js
index 5f112697..e75fcd5e 100644
--- a/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js
+++ b/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js
@@ -342,7 +342,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
 
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js
index 313e885b..e9385053 100644
--- a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js
+++ b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js
@@ -339,7 +339,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
         
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Space/SpaceCost.js b/web/src/components/MyEMS/Space/SpaceCost.js
index 024de40a..c0d6a05e 100644
--- a/web/src/components/MyEMS/Space/SpaceCost.js
+++ b/web/src/components/MyEMS/Space/SpaceCost.js
@@ -277,7 +277,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
 
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Space/SpaceEnergyCategory.js b/web/src/components/MyEMS/Space/SpaceEnergyCategory.js
index b59d2c86..642fa215 100644
--- a/web/src/components/MyEMS/Space/SpaceEnergyCategory.js
+++ b/web/src/components/MyEMS/Space/SpaceEnergyCategory.js
@@ -276,7 +276,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
         
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Store/StoreCost.js b/web/src/components/MyEMS/Store/StoreCost.js
index 5fc1bfd0..f2790e52 100644
--- a/web/src/components/MyEMS/Store/StoreCost.js
+++ b/web/src/components/MyEMS/Store/StoreCost.js
@@ -343,7 +343,7 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
 
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Store/StoreEnergyCategory.js b/web/src/components/MyEMS/Store/StoreEnergyCategory.js
index b3cb8d8c..36e1f544 100644
--- a/web/src/components/MyEMS/Store/StoreEnergyCategory.js
+++ b/web/src/components/MyEMS/Store/StoreEnergyCategory.js
@@ -339,7 +339,7 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
         
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Tenant/TenantCost.js b/web/src/components/MyEMS/Tenant/TenantCost.js
index 520cda24..fa1f90c4 100644
--- a/web/src/components/MyEMS/Tenant/TenantCost.js
+++ b/web/src/components/MyEMS/Tenant/TenantCost.js
@@ -343,7 +343,7 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => {
 
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js b/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js
index 355925d9..2f947e49 100644
--- a/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js
+++ b/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js
@@ -338,7 +338,7 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
         
         let timeOfUseArray = [];
         json['reporting_period']['energy_category_ids'].forEach((currentValue, index) => {
-          if(currentValue == 1) {
+          if(currentValue === 1) {
             // energy_category_id 1 electricity
             let timeOfUseItem = {}
             timeOfUseItem['id'] = 1;
diff --git a/web/src/components/MyEMS/dashboard/Dashboard.js b/web/src/components/MyEMS/dashboard/Dashboard.js
index 14a43fa6..ffcaf316 100644
--- a/web/src/components/MyEMS/dashboard/Dashboard.js
+++ b/web/src/components/MyEMS/dashboard/Dashboard.js
@@ -151,7 +151,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
 
             let timeOfUseArray = [];
             json['reporting_period_input']['energy_category_ids'].forEach((currentValue, index) => {
-              if(currentValue == 1) {
+              if(currentValue === 1) {
                 // energy_category_id 1 electricity
                 let timeOfUseItem = {}
                 timeOfUseItem['id'] = 1;