diff --git a/src/layout/DefaultLayout.module.scss b/src/layout/DefaultLayout.module.scss
index 4e9fdcfb..f378ede6 100644
--- a/src/layout/DefaultLayout.module.scss
+++ b/src/layout/DefaultLayout.module.scss
@@ -65,12 +65,14 @@
 .mainContent {
   margin-left: calc(var(--sidenav-width-close)); // sidenav bar width
   width: calc(100% - var(--sidenav-width-close));
-  height: calc(
-    100% - 58px
-  ); // 58px is the height of the topnav bar, 40px is the height of the sticky banner
+  height: 100%;
   overflow-y: auto;
 }
 
+.mainContentWithTopBar {
+  height: calc(100% - 58px); // 58px is the height of the topnav bar
+}
+
 .mainContentWithStickyBanner {
   height: calc(
     100% - 58px - 36px
diff --git a/src/layout/DefaultLayout.tsx b/src/layout/DefaultLayout.tsx
index 007e3061..48fda32d 100644
--- a/src/layout/DefaultLayout.tsx
+++ b/src/layout/DefaultLayout.tsx
@@ -303,6 +303,7 @@ function DefaultLayout() {
         <div
           className={cx(styles.mainContent, {
             [styles.noScroll]: shouldShowScroll,
+            [styles.mainContentWithTopBar]: !hideTopNavBarRoutes,
             [styles.mainContentWithStickyBanner]: shouldShowStickyBanner
           })}
         >
diff --git a/src/pages/AgencyPincodeMapping/components/DataTable/index.tsx b/src/pages/AgencyPincodeMapping/components/DataTable/index.tsx
index 4ad79fb9..83f781eb 100644
--- a/src/pages/AgencyPincodeMapping/components/DataTable/index.tsx
+++ b/src/pages/AgencyPincodeMapping/components/DataTable/index.tsx
@@ -1,13 +1,12 @@
-import React, { Suspense, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import GridRow from '../../../../../web-ui-library/src/layouts/Grid/GridRow/GridRow';
 import GridColumn from '../../../../../web-ui-library/src/layouts/Grid/GridColumn/GridColumn';
-import styles from '../../../Cases/components/Cases.module.scss';
 import Pagination from '@components/Pagination';
 import { DropDownPosition } from '@components/Pagination/constant';
 import DataTableHeader from '../DataTableHeader';
 import axiosInstance, { ApiKeys, getApiUrl } from '../../../../utils/ApiHelper';
 import { useSelector } from 'react-redux';
-import { AgencySummary, Serviceability } from '../../types';
+import { AgencySummary } from '../../types';
 import { RootState } from '@cp/src/store';
 import Loader from '../../../../components/Loader/Loader';
 import toProperCase from '@cp/src/utils/toProperCase';
@@ -107,7 +106,7 @@ function DataTable({ openUploadDialog }: DataTableProps) {
       </GridRow>
 
       <GridRow className="no-gutters">
-        <GridColumn md={12} className={styles.cases__table}>
+        <GridColumn md={12} className={'h-[calc(100vh-210px)]'}>
           <AgTable
             defaultColDef={{
               suppressMovable: true
diff --git a/src/pages/LiveLocationTracker/components/TopBar/Filters.tsx b/src/pages/LiveLocationTracker/components/TopBar/Filters.tsx
index 7faa0bb0..3390c5a6 100644
--- a/src/pages/LiveLocationTracker/components/TopBar/Filters.tsx
+++ b/src/pages/LiveLocationTracker/components/TopBar/Filters.tsx
@@ -55,9 +55,6 @@ const Filters = () => {
       return;
     }
 
-    const isInhouseAgencySelected =
-      queryParams[FilterTypes.AGENCY] === INHOUSE_AGENCY_CODE.toString();
-
     const applyFilterRecursively = (filterType: FilterTypes) => {
       const selectedFilter = queryParams[filterType];
       const { nextFilter } = FilterMap[filterType];
@@ -72,7 +69,6 @@ const Filters = () => {
         return;
       }
 
-      // If selected agency is inhouse, anyway get the agent locations
       if (filterType === FilterTypes.AGENCY) {
         dispatch(getAgentsLocations(pinsPayload));
       }
@@ -87,8 +83,8 @@ const Filters = () => {
       applyFilterRecursively(nextFilter);
     };
 
-    if (!queryParams?.AGENTID) applyFilterRecursively(FilterTypes.AGENCY);
-  }, [searchParams, filters]);
+    applyFilterRecursively(FilterTypes.AGENCY);
+  }, [queryParams?.AGENCY, queryParams?.TEAM_LEAD, filters]);
 
   const handleFilterChange = (value: string, filterType: FilterTypes) => {
     dispatch(setMapLocations({ data: [] }));
diff --git a/src/pages/LiveLocationTracker/components/TopBar/index.tsx b/src/pages/LiveLocationTracker/components/TopBar/index.tsx
index caebad02..dd958733 100644
--- a/src/pages/LiveLocationTracker/components/TopBar/index.tsx
+++ b/src/pages/LiveLocationTracker/components/TopBar/index.tsx
@@ -57,11 +57,6 @@ function TopBar() {
     if (!selectedAgency) {
       return true;
     }
-    const isInhouseAgencySelected =
-      queryParams[FilterTypes.AGENCY] === INHOUSE_AGENCY_CODE.toString();
-    if (!isInhouseAgencySelected && !queryParams[FilterTypes.TEAM_LEAD]) {
-      return true;
-    }
     return false;
   }, [selectedAgency, queryParams?.TEAM_LEAD, queryParams?.AGENCY]);