diff --git a/src/main/java/com/metro/services/ReportService.java b/src/main/java/com/metro/services/ReportService.java
index ee743b0..991a9cc 100644
--- a/src/main/java/com/metro/services/ReportService.java
+++ b/src/main/java/com/metro/services/ReportService.java
@@ -168,6 +168,14 @@ public class ReportService {
 					"WHERE BP.IS_ACTIVE = 'N' AND DST.ID_STATUS = 1 " +
 					"and UPDT_TIMESTAMP between to_date('"+getFromdate()+"','dd/mm/rrrr') and to_date('"+getTodate()+"','dd/mm/rrrr')" +
 					"order by PROPERTYID,DEACTIVATED_DATE";
+		}else if(getDatetype().equals("deActiveWithRemark")){
+			query="select bpd.propertyid Property_ID, st.STATUS_NAME, psv.ref_num, psv.ref_date Deactivated_On, psv.effect_Period, psv.EXTRA_FIELD2 Deactivation_Reason, psv.remarks " +
+					"from egpt_basic_property@erp bpd " +
+					"inner join egpt_property_status_values@erp psv on psv.id_basic_property=bpd.id_basic_property " +
+					"inner join egpt_status@erp st on st.id_status =psv.id_status " +
+					"where (psv.id_status = (select id_status from egpt_status@erp where code='ACTIVE') or psv.id_status = (select id_status from egpt_status@erp where code='INACTIVE')) " +
+					" and UPDT_TIMESTAMP between to_date('"+getFromdate()+"','dd/mm/rrrr') and to_date('15-09-19','dd/mm/rrrr') "+
+					"order by bpd.propertyid, psv.ref_date, st.STATUS_NAME";
 		}
 
 		return query;
diff --git a/src/main/resources/templates/feedback/RequestForm.html b/src/main/resources/templates/feedback/RequestForm.html
index d293e3f..c2ee606 100644
--- a/src/main/resources/templates/feedback/RequestForm.html
+++ b/src/main/resources/templates/feedback/RequestForm.html
@@ -21,11 +21,11 @@
   <meta property="og:image" content="">
 
 
-  <link rel="shortcut icon" href="assets/media/favicons/favicon.png">
-  <link rel="icon" type="image/png" sizes="192x192" href="assets/media/favicons/favicon-192x192.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="assets/media/favicons/apple-touch-icon-180x180.png">
+  <link rel="shortcut icon" href="/assets/media/favicons/favicon.png">
+  <link rel="icon" type="image/png" sizes="192x192" href="/assets/media/favicons/favicon-192x192.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="/assets/media/favicons/apple-touch-icon-180x180.png">
 
-  <link rel="stylesheet" id="css-main" href="assets/css/dashmix.min.css">
+  <link rel="stylesheet" id="css-main" href="/assets/css/dashmix.min.css">
  
 </head>
 
@@ -93,7 +93,7 @@
   <!-- Main Container -->
   <main id="main-container">
     <!-- Hero -->
-    <div class="bg-image" style="background-image: url('assets/media/photos/photo15@2x.jpg');">
+    <div class="bg-image" style="background-image: url('/assets/media/photos/photo15@2x.jpg');">
       <div class="bg-primary-dark-op" style="background-color:rgb(4 128 146 / 80%)!important">
         <div class="content content-full">
           <div class="py-3 text-center">
diff --git a/src/main/resources/templates/fragments/aside-right.html b/src/main/resources/templates/fragments/aside-right.html
index 4a3af1c..6104f63 100644
--- a/src/main/resources/templates/fragments/aside-right.html
+++ b/src/main/resources/templates/fragments/aside-right.html
@@ -5,7 +5,7 @@
             <div class="content-header">
               <!-- User Avatar -->
               <a class="img-link me-1" href="be_pages_generic_profile.html">
-                <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar10.jpg" alt="">
+                <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar10.jpg" alt="">
               </a>
               <!-- END User Avatar -->
 
@@ -65,42 +65,42 @@
                         </a>
                       </div>
                       <div class="col-4 mb-1">
-                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xwork" data-toggle="theme" data-theme="assets/css/themes/xwork.min.css" href="#">
+                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xwork" data-toggle="theme" data-theme="/assets/css/themes/xwork.min.css" href="#">
                           xWork
                         </a>
                       </div>
                       <div class="col-4 mb-1">
-                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xmodern" data-toggle="theme" data-theme="assets/css/themes/xmodern.min.css" href="#">
+                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xmodern" data-toggle="theme" data-theme="/assets/css/themes/xmodern.min.css" href="#">
                           xModern
                         </a>
                       </div>
                       <div class="col-4 mb-1">
-                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xeco" data-toggle="theme" data-theme="assets/css/themes/xeco.min.css" href="#">
+                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xeco" data-toggle="theme" data-theme="/assets/css/themes/xeco.min.css" href="#">
                           xEco
                         </a>
                       </div>
                       <div class="col-4 mb-1">
-                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xsmooth" data-toggle="theme" data-theme="assets/css/themes/xsmooth.min.css" href="#">
+                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xsmooth" data-toggle="theme" data-theme="/assets/css/themes/xsmooth.min.css" href="#">
                           xSmooth
                         </a>
                       </div>
                       <div class="col-4 mb-1">
-                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xinspire" data-toggle="theme" data-theme="assets/css/themes/xinspire.min.css" href="#">
+                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xinspire" data-toggle="theme" data-theme="/assets/css/themes/xinspire.min.css" href="#">
                           xInspire
                         </a>
                       </div>
                       <div class="col-4 mb-1">
-                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xdream" data-toggle="theme" data-theme="assets/css/themes/xdream.min.css" href="#">
+                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xdream" data-toggle="theme" data-theme="/assets/css/themes/xdream.min.css" href="#">
                           xDream
                         </a>
                       </div>
                       <div class="col-4 mb-1">
-                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xpro" data-toggle="theme" data-theme="assets/css/themes/xpro.min.css" href="#">
+                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xpro" data-toggle="theme" data-theme="/assets/css/themes/xpro.min.css" href="#">
                           xPro
                         </a>
                       </div>
                       <div class="col-4 mb-1">
-                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xplay" data-toggle="theme" data-theme="assets/css/themes/xplay.min.css" href="#">
+                        <a class="d-block py-3 text-white fs-sm fw-semibold bg-xplay" data-toggle="theme" data-theme="/assets/css/themes/xplay.min.css" href="#">
                           xPlay
                         </a>
                       </div>
@@ -191,7 +191,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar3.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar3.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-success"></span>
                           </div>
                           <div class="flex-grow-1">
@@ -203,7 +203,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar15.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar15.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-success"></span>
                           </div>
                           <div class="flex-grow-1">
@@ -215,7 +215,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar8.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar8.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-success"></span>
                           </div>
                           <div class="flex-grow-1">
@@ -237,7 +237,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar8.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar8.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-danger"></span>
                           </div>
                           <div class="flex-grow-1">
@@ -259,7 +259,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar14.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar14.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-warning"></span>
                           </div>
                           <div class="flex-grow-1">
@@ -271,7 +271,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar8.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar8.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-warning"></span>
                           </div>
                           <div class="flex-grow-1">
@@ -293,7 +293,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar13.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar13.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-muted"></span>
                           </div>
                           <div class="flex-grow-1">
@@ -305,7 +305,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar3.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar3.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-muted"></span>
                           </div>
                           <div class="flex-grow-1">
@@ -317,7 +317,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar8.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar8.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-muted"></span>
                           </div>
                           <div class="flex-grow-1">
@@ -329,7 +329,7 @@
                       <li>
                         <a class="d-flex py-2" href="be_pages_generic_profile.html">
                           <div class="flex-shrink-0 mx-3 overlay-container">
-                            <img class="img-avatar img-avatar48" src="assets/media/avatars/avatar14.jpg" alt="">
+                            <img class="img-avatar img-avatar48" src="/assets/media/avatars/avatar14.jpg" alt="">
                             <span class="overlay-item item item-tiny item-circle border border-2 border-white bg-muted"></span>
                           </div>
                           <div class="flex-grow-1">
diff --git a/src/main/resources/templates/fragments/head-public.html b/src/main/resources/templates/fragments/head-public.html
index 5888c02..56ff72e 100644
--- a/src/main/resources/templates/fragments/head-public.html
+++ b/src/main/resources/templates/fragments/head-public.html
@@ -20,24 +20,24 @@
 
     <!-- Icons -->
     <!-- The following icons can be replaced with your own, they are used by desktop and mobile browsers -->
-    <link rel="shortcut icon" href="assets/media/favicons/favicon.png">
-    <link rel="icon" type="image/png" sizes="192x192" href="assets/media/favicons/favicon-192x192.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="assets/media/favicons/apple-touch-icon-180x180.png">
+    <link rel="shortcut icon" href="/assets/media/favicons/favicon.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="/assets/media/favicons/favicon-192x192.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/assets/media/favicons/apple-touch-icon-180x180.png">
     <!-- END Icons -->
 
     <!-- Stylesheets -->
     <!-- Page JS Plugins CSS -->
-    <link rel="stylesheet" href="assets/js/plugins/datatables-bs5/css/dataTables.bootstrap5.min.css">
-    <link rel="stylesheet" href="assets/js/plugins/datatables-buttons-bs5/css/buttons.bootstrap5.min.css">
-    <link rel="stylesheet" href="assets/js/plugins/datatables-responsive-bs5/css/responsive.bootstrap5.min.css">
+    <link rel="stylesheet" href="/assets/js/plugins/datatables-bs5/css/dataTables.bootstrap5.min.css">
+    <link rel="stylesheet" href="/assets/js/plugins/datatables-buttons-bs5/css/buttons.bootstrap5.min.css">
+    <link rel="stylesheet" href="/assets/js/plugins/datatables-responsive-bs5/css/responsive.bootstrap5.min.css">
     <!-- Page JS Plugins CSS -->
-    <link rel="stylesheet" href="assets/js/plugins/sweetalert2/sweetalert2.min.css">
+    <link rel="stylesheet" href="/assets/js/plugins/sweetalert2/sweetalert2.min.css">
     <!-- Dashmix framework -->
-    <link rel="stylesheet" id="css-main" href="assets/css/dashmix.css">
+    <link rel="stylesheet" id="css-main" href="/assets/css/dashmix.css">
 
     <!-- You can include a specific file from css/themes/ folder to alter the default color theme of the template. eg: -->
-    <!-- <link rel="stylesheet" id="css-theme" href="assets/css/themes/xwork.min.css"> -->
-	<link rel="stylesheet" id="css-theme" href="assets/css/themes/xinspire.css">
+    <!-- <link rel="stylesheet" id="css-theme" href="/assets/css/themes/xwork.min.css"> -->
+	<link rel="stylesheet" id="css-theme" href="/assets/css/themes/xinspire.css">
 	<style>
 		body {
 		  color: #343a40;
diff --git a/src/main/resources/templates/fragments/head.html b/src/main/resources/templates/fragments/head.html
index 7bcb3bc..04887b9 100644
--- a/src/main/resources/templates/fragments/head.html
+++ b/src/main/resources/templates/fragments/head.html
@@ -4,7 +4,7 @@
 
 	<title th:text="'GCC - '+${title}">GCC</title>
 	
-	<base th:href="${baseURL}"/>
+	<!--<base th:href="${baseURL}"/>-->
     
     <meta name="description" content="GCC - Pet Registry">
     <meta name="author" content="BonTon Softwares pvt Limited">
@@ -20,23 +20,23 @@
 
     <!-- Icons -->
     <!-- The following icons can be replaced with your own, they are used by desktop and mobile browsers -->
-    <link rel="shortcut icon" href="assets/media/favicons/favicon.png">
-    <link rel="icon" type="image/png" sizes="192x192" href="assets/media/favicons/favicon-192x192.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="assets/media/favicons/apple-touch-icon-180x180.png">
+    <link rel="shortcut icon" href="/assets/media/favicons/favicon.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="/assets/media/favicons/favicon-192x192.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/assets/media/favicons/apple-touch-icon-180x180.png">
     <!-- END Icons -->
 
     <!-- Stylesheets -->
     <!-- Page JS Plugins CSS -->
-<!--    <link rel="stylesheet" href="assets/js/plugins/datatables-bs5/css/dataTables.bootstrap5.min.css">-->
-<!--    <link rel="stylesheet" href="assets/js/plugins/datatables-buttons-bs5/css/buttons.bootstrap5.min.css">-->
-<!--    <link rel="stylesheet" href="assets/js/plugins/datatables-responsive-bs5/css/responsive.bootstrap5.min.css">-->
+<!--    <link rel="stylesheet" href="/assets/js/plugins/datatables-bs5/css/dataTables.bootstrap5.min.css">-->
+<!--    <link rel="stylesheet" href="/assets/js/plugins/datatables-buttons-bs5/css/buttons.bootstrap5.min.css">-->
+<!--    <link rel="stylesheet" href="/assets/js/plugins/datatables-responsive-bs5/css/responsive.bootstrap5.min.css">-->
     <!-- Page JS Plugins CSS -->
-    <link rel="stylesheet" href="assets/js/plugins/sweetalert2/sweetalert2.min.css">
+    <link rel="stylesheet" href="/assets/js/plugins/sweetalert2/sweetalert2.min.css">
     <!-- Dashmix framework -->
-    <link rel="stylesheet" id="css-main" href="assets/css/dashmix.css">
+    <link rel="stylesheet" id="css-main" href="/assets/css/dashmix.css">
 
     <!-- You can include a specific file from css/themes/ folder to alter the default color theme of the template. eg: -->
-    <!-- <link rel="stylesheet" id="css-theme" href="assets/css/themes/xwork.min.css"> -->
-	<link rel="stylesheet" id="css-theme" href="assets/css/themes/xinspire.css">
+    <!-- <link rel="stylesheet" id="css-theme" href="/assets/css/themes/xwork.min.css"> -->
+	<link rel="stylesheet" id="css-theme" href="/assets/css/themes/xinspire.css">
     <!-- END Stylesheets -->
   </head>
diff --git a/src/main/resources/templates/fragments/header-public.html b/src/main/resources/templates/fragments/header-public.html
index c3228c2..db829bc 100644
--- a/src/main/resources/templates/fragments/header-public.html
+++ b/src/main/resources/templates/fragments/header-public.html
@@ -6,7 +6,7 @@
 					<!--<img src="assets/media/images/tamilnadu-logo.png" style="padding-top:2px;" width="50px" alt="Tamilnadu Logo">-->
 					</div>
 					<div class="col-2 text-center">
-				        <img src='assets/media/images/logo-sm.png' width="55" alt="Logo Sm">
+				        <img src='/assets/media/images/logo-sm.png' width="55" alt="Logo Sm">
 					</div>
 
 					<div class="col-8 text-center" style="font-size:13px;">
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
index 3d41b05..bacec11 100644
--- a/src/main/resources/templates/fragments/header.html
+++ b/src/main/resources/templates/fragments/header.html
@@ -13,10 +13,10 @@
           <!-- END Left Section -->
 		<div class="row pt-1" style="margin:0px;">
 			<!--<div class="col-2 text-center p-1">
-			<img src="assets/media/images/tamilnadu-logo.png" style="padding-top:2px;" width="30px" alt="Tamilnadu Logo">
+			<img src="/assets/media/images/tamilnadu-logo.png" style="padding-top:2px;" width="30px" alt="Tamilnadu Logo">
 			</div>-->
           <div class="col-2 text-center p-1">
-            <img src='assets/media/images/logo-sm.png' width="37" alt="Logo Sm">
+            <img src='/assets/media/images/logo-sm.png' width="37" alt="Logo Sm">
           </div>
 			<div class="col-8 text-center p-0" style="font-size:15px;">
 				பெருநகர சென்னை மாநகராட்சி
diff --git a/src/main/resources/templates/fragments/script.html b/src/main/resources/templates/fragments/script.html
index d30eaac..2042967 100644
--- a/src/main/resources/templates/fragments/script.html
+++ b/src/main/resources/templates/fragments/script.html
@@ -1,11 +1,11 @@
 
-<script src="assets/js/dashmix.app.min.js"></script>
+<script src="/assets/js/dashmix.app.min.js"></script>
     <!-- jQuery (required for DataTables plugin) -->
-    <script src="assets/js/lib/jquery.min.js"></script>
+    <script src="/assets/js/lib/jquery.min.js"></script>
 
 
     <!-- Page JS Plugins -->
-    <script src="assets/js/plugins/sweetalert2/sweetalert2.min.js"></script>
+    <script src="/assets/js/plugins/sweetalert2/sweetalert2.min.js"></script>
 	<script>
 		$(document).ready(function() {
 		  // Get the current URL
diff --git a/src/main/resources/templates/fragments/side-header.html b/src/main/resources/templates/fragments/side-header.html
index 9a45966..7c69d68 100644
--- a/src/main/resources/templates/fragments/side-header.html
+++ b/src/main/resources/templates/fragments/side-header.html
@@ -6,7 +6,7 @@
                 D<span class="opacity-75">x</span>
               </span>
               <span class="smini-hidden">
-                <img src="assets/media/images/logo-sm.png" alt="logo-small" width="25px"> GCC - <span class="opacity-75">METRO WATER</span>
+                <img src="/assets/media/images/logo-sm.png" alt="logo-small" width="25px"> GCC - <span class="opacity-75">METRO WATER</span>
               </span>
             </a>
             <!-- END Logo -->
diff --git a/src/main/resources/templates/metro/report.html b/src/main/resources/templates/metro/report.html
index c2d2232..d283968 100644
--- a/src/main/resources/templates/metro/report.html
+++ b/src/main/resources/templates/metro/report.html
@@ -92,6 +92,7 @@
 											<option value="new" selected>New</option>
 											<option value="modify">Modify</option>
 											<option value="deActive">De Active </option>
+											<option value="deActiveWithRemark">De Active With Remark</option>
 											<option value="nameTransfer">Name Transfer </option>
 											<option value="entries">Metro Water Entries  </option>
 										</select>