diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
index 906eb5c076..4fe6e70fd3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
@@ -526,7 +526,7 @@
                 <div class="form-group">
                     <label class="text-primary" for="areaName">Fence name</label>
                     <input class="form-control" id="areaName" placeholder="Fence name" type="text">
-                    <span class="help-block">Name of the selected area(i.e colombo)</span>
+                    <span class="help-block">Name of the selected area(e.g. colombo)</span>
                 </div>
                 <div>
                     <div class="btn-group btn-group-sm btn-group-justified">
@@ -557,7 +557,7 @@
                 <div class="form-group">
                     <label class="text-primary" for="areaName">Fence name</label>
                     <input class="form-control" id="areaName" placeholder="Fence name" type="text">
-                    <span class="help-block">Name of the selected area(i.e colombo)</span>
+                    <span class="help-block">Name of the selected area(e.g. colombo)</span>
                 </div>
                 <div>
                     <div class="btn-group btn-group-sm btn-group-justified">
@@ -589,7 +589,7 @@
                 <div class="form-group">
                     <label class="text-primary" for="areaName">Fence name</label>
                     <input class="form-control" id="areaName" placeholder="Stationery name" type="text">
-                    <span class="help-block">Name of the selected area(i.e colombo)</span>
+                    <span class="help-block">Name of the selected area(e.g. colombo)</span>
 
                     <label class="text-primary" for="fRadius">Fluctuation radius</label>
                     <input class="form-control" id="fRadius" onblur="reformatRadius(this.form.fRadius.value);" placeholder="m" type="text">
@@ -626,7 +626,7 @@
                 <div class="form-group">
                     <label class="text-primary" for="areaName">Fence name</label>
                     <input class="form-control" id="areaName" placeholder="Area Name" type="text">
-                    <span class="help-block">Name of the selected area(i.e colombo)</span>
+                    <span class="help-block">Name of the selected area(e.g. colombo)</span>
                 </div>
                 <div>
                     <div class="btn-group btn-group-sm btn-group-justified">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
index 56b5c79cda..37b617e58d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
@@ -34,7 +34,7 @@
     <button class="close" type="button" data-dismiss="modal" aria-hidden="true">&times;</button>
     <div class="col-lg-5 col-md-6 col-centered">
         <h4>
-            Set 'Stationery' alerts
+            Set 'Stationary' alerts
             <br>
         </h4>
     </div>
@@ -46,8 +46,8 @@
                 <table class="table table-hover" id="stationary-alert-table">
                     <thead>
                     <tr>
-                        <th>Stationery Name</th>
-                        <th>Stationery Time</th>
+                        <th>Stationary Name</th>
+                        <th>Stationary Time</th>
                         <th>Fluctuation Radius</th>
                         <th>Query Name</th>
                         <th>Created On</th>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_exit_fence.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_exit_fence.js
index cdcfb41568..8169e136c1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_exit_fence.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_exit_fence.js
@@ -34,6 +34,7 @@ function initializeExit() {
             }
         } else{
             $(".fence-not-exist").show();
+            $("#exit-alert").hide();
         }
         $('.viewGeoFenceRow td:not(:last-child)').click(function () {
             viewFence(this.parentElement,'Exit');
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_stationary.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_stationary.js
index 6eee4234ab..99ddd9eecd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_stationary.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_stationary.js
@@ -38,6 +38,7 @@ function initStationaryAlert() {
             }
         } else{
             $(".fence-not-exist").show();
+            $("#stationary-alert-table").hide();
         }
         $('.viewGeoFenceRow td:not(:last-child)').click(function () {
             viewFence(this.parentElement,'Stationery');
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_within.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_within.js
index f4986075f5..8640e05b8a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_within.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_within.js
@@ -34,6 +34,7 @@ function initializeWithin() {
             }
         } else{
             $(".fence-not-exist").show();
+            $("#within-alert").hide();
         }
         $('.viewGeoFenceRow td:not(:last-child)').click(function () {
             viewFence(this.parentElement,'WithIn');