diff --git a/src/components/work/WorksiteActions.vue b/src/components/work/WorksiteActions.vue
index 9e5e810f6..dc0d5b59a 100644
--- a/src/components/work/WorksiteActions.vue
+++ b/src/components/work/WorksiteActions.vue
@@ -500,36 +500,6 @@
           </v-menu>
         </template>
       </v-popover>
-      <base-button
-        class="text-base font-thin mx-2"
-        data-testid="testWorksiteFiltersButton"
-        ccu-icon="filters"
-        icon-size="medium"
-        icon-classes="w-4"
-        :alt="$t('casesVue.filters')"
-        :action="
-          () => {
-            showingFilters = true;
-          }
-        "
-      >
-        {{ $t('casesVue.filters') }}
-        <span
-          v-if="filtersCount > 0"
-          class="rounded-full mx-2 px-1 bg-yellow-500 text-xs"
-          >{{ filtersCount }}</span
-        >
-      </base-button>
-      <WorksiteFilters
-        ref="worksiteFilter"
-        :show="showingFilters"
-        :current-filters="initalFilters"
-        :incident="currentIncident"
-        :locations="organizationLocations"
-        @closed-filters="showingFilters = false"
-        @updated-filters="handleFilters"
-        @update-filters-count="filtersCount = $event"
-      />
       <base-button
         class="text-base font-thin mx-2"
         data-testid="testDownloadCsvButton"
diff --git a/src/components/work/WorksiteFilters.vue b/src/components/work/WorksiteFilters.vue
index 39de8df98..c2db409a6 100644
--- a/src/components/work/WorksiteFilters.vue
+++ b/src/components/work/WorksiteFilters.vue
@@ -157,6 +157,21 @@
               >{{ datesCount }}</span
             >
           </div>
+          <div
+            class="p-3 px-4 border-b cursor-pointer"
+            data-testid="testDateSectionDiv"
+            :class="{
+              'border-l-4 border-l-black': currentSection === 'lists',
+            }"
+            @click="currentSection = 'lists'"
+          >
+            {{ $t('~~Lists') }}
+            <span
+              v-if="listsCount > 0"
+              class="rounded-full px-1 bg-black text-white text-xs"
+              >{{ listsCount }}</span
+            >
+          </div>
         </div>
         <div class="w-3/4 ml-4 mt-2 flex-grow modal-item">
           <div v-if="currentSection === 'general'" class="flex flex-col">
@@ -226,7 +241,7 @@
                 class="block my-1"
                 data-testid="testOpenCheckbox"
                 :model-value="filters.statusGroups.data['open']"
-                @update:modelValue="
+                @update:model-value="
                   (value) => {
                     setOpenClosed(value, 'open');
                   }
@@ -237,7 +252,7 @@
                 class="block my-1"
                 data-testid="testClosedCheckbox"
                 :model-value="filters.statusGroups.data['closed']"
-                @update:modelValue="
+                @update:model-value="
                   (value) => {
                     setOpenClosed(value, 'closed');
                   }
@@ -259,7 +274,7 @@
                   class="block my-1"
                   :data-testid="`testStatus${status.status}Checkbox`"
                   :model-value="filters.statuses.data[status.status]"
-                  @update:modelValue="
+                  @update:model-value="
                     (value) => {
                       filters.statuses.data[status.status] = value;
                       filters.statuses.data = {
@@ -283,7 +298,7 @@
                 :data-testid="`testFlag${flag}Checkbox`"
                 class="block my-1"
                 :model-value="filters.flags.data[flag]"
-                @update:modelValue="
+                @update:model-value="
                   (value) => {
                     filters.flags.data[flag] = value;
                     filters.flags.data = { ...filters.flags.data };
@@ -321,7 +336,7 @@
                 :data-testid="`testPersonal${data}Checkbox`"
                 class="block my-1"
                 :model-value="filters.form_data.data[data]"
-                @update:modelValue="
+                @update:model-value="
                   (value) => {
                     filters.form_data.data[data] = value;
                     filters.form_data.data = { ...filters.form_data.data };
@@ -453,7 +468,7 @@
                 :data-testid="`testTeam${team.id}Checkbox`"
                 class="block my-1"
                 :model-value="filters.teams.data[team.id]"
-                @update:modelValue="
+                @update:model-value="
                   (value) => {
                     filters.teams.data[team.id] = value;
                     filters.teams.data = { ...filters.teams.data };
@@ -497,7 +512,7 @@
                     class="block my-1"
                     :data-testid="`testMyLocations${location.id}Checkbox`"
                     :model-value="filters.locations.data[location.id]"
-                    @update:modelValue="
+                    @update:model-value="
                       (value) => {
                         filters.locations.data[location.id] = value;
                         filters.locations.data = {
@@ -520,12 +535,9 @@
                 <datepicker
                   v-model="filters.dates.data.created"
                   data-testid="testCreatedDatePickerInput"
-                  input-class="h-10 p-1 outline-none w-56 border border-crisiscleanup-dark-100 text-sm mb-2"
-                  wrapper-class="flex-grow"
-                  :formatter="{
-                    date: 'YYYY-MM-DD',
-                    month: 'MMM',
-                  }"
+                  class="h-12 mr-2"
+                  range
+                  v-bind="datePickerDefaultProps"
                   :placeholder="$t('worksiteFilters.start_date')"
                 ></datepicker>
                 <div class="my-1 text-base">
@@ -534,17 +546,88 @@
                 <datepicker
                   v-model="filters.dates.data.updated"
                   data-testid="testUpdatedDatePickerInput"
-                  input-class="h-10 p-1 outline-none w-56 border border-crisiscleanup-dark-100 text-sm mb-2"
-                  wrapper-class="flex-grow"
-                  :formatter="{
-                    date: 'YYYY-MM-DD',
-                    month: 'MMM',
-                  }"
+                  class="h-12 mr-2"
+                  range
+                  v-bind="datePickerDefaultProps"
                   :placeholder="$t('worksiteFilters.start_date')"
                 ></datepicker>
               </div>
             </div>
           </div>
+          <div v-if="currentSection === 'lists'" class="flex flex-col">
+            <div class="status-group mb-2">
+              <div class="my-1 text-base">
+                {{ $t('~~Lists') }}
+              </div>
+              <div class="grid grid-cols-3 grid-col-flow gap-3 p-3">
+                <template v-for="list in lists" :key="list.id">
+                  {{ list.name }}
+                  <base-button
+                    :class="[
+                      !filters.lists.data.exclude_lists.some(
+                        (excludedItem) => excludedItem.id === list.id,
+                      )
+                        ? 'bg-crisiscleanup-dark-100'
+                        : 'bg-crisiscleanup-red-100 bg-opacity-100',
+                    ]"
+                    :action="
+                      () => {
+                        const isExcluded =
+                          filters.lists.data.exclude_lists.some(
+                            (excludedItem) => excludedItem.id === list.id,
+                          );
+                        if (isExcluded) {
+                          filters.lists.data.exclude_lists =
+                            filters.lists.data.exclude_lists.filter(
+                              (item) => item.id !== list.id,
+                            );
+                        } else {
+                          filters.lists.data.exclude_lists.push(list);
+                          // Remove from include list if it exists
+                          filters.lists.data.include_lists =
+                            filters.lists.data.include_lists.filter(
+                              (item) => item.id !== list.id,
+                            );
+                        }
+                      }
+                    "
+                    :text="$t('~~Subtract')"
+                  />
+                  <base-button
+                    :class="[
+                      !filters.lists.data.include_lists.some(
+                        (includedItem) => includedItem.id === list.id,
+                      )
+                        ? 'bg-crisiscleanup-dark-100'
+                        : 'bg-crisiscleanup-green-100 bg-opacity-100',
+                    ]"
+                    :action="
+                      () => {
+                        const isIncluded =
+                          filters.lists.data.include_lists.some(
+                            (includedItem) => includedItem.id === list.id,
+                          );
+                        if (isIncluded) {
+                          filters.lists.data.include_lists =
+                            filters.lists.data.include_lists.filter(
+                              (item) => item.id !== list.id,
+                            );
+                        } else {
+                          filters.lists.data.include_lists.push(list);
+                          // Remove from exclude list if it exists
+                          filters.lists.data.exclude_lists =
+                            filters.lists.data.exclude_lists.filter(
+                              (item) => item.id !== list.id,
+                            );
+                        }
+                      }
+                    "
+                    :text="$t('~~Add')"
+                  />
+                </template>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -580,24 +663,26 @@
 <script lang="ts">
 import { useStore } from 'vuex';
 import { computed, onMounted, ref, watch } from 'vue';
-import LitepieDatepicker from 'litepie-datepicker';
-import Team from '../../models/Team';
-import WorksiteFieldsFilter from '../../utils/data_filters/WorksiteFieldsFilter';
-import WorksiteFlagsFilter from '../../utils/data_filters/WorksiteFlagsFilter';
-import FormDataFilter from '../../utils/data_filters/FormDataFilter';
-import WorksiteStatusGroupFilter from '../../utils/data_filters/WorksiteStatusGroupFilter';
-import WorksiteStatusFilter from '../../utils/data_filters/WorksiteStatusFilter';
-import WorksiteLocationsFilter from '../../utils/data_filters/WorksiteLocationsFilter';
-import WorksiteMissingWorkTypeFilter from '../../utils/data_filters/WorksiteMissingWorkTypeFilter';
-import WorksiteMyTeamFilter from '../../utils/data_filters/WorksiteMyTeamFilter';
-import SurvivorFilter from '../../utils/data_filters/SurvivorFilter';
-import WorksiteTeamsFilter from '../../utils/data_filters/WorksiteTeamsFilter';
-import WorksiteDatesFilter from '../../utils/data_filters/WorksiteDatesFilter';
-import { getStatusName } from '../../filters/index';
+import Team from '@/models/Team';
+import WorksiteFieldsFilter from '@/utils/data_filters/WorksiteFieldsFilter';
+import WorksiteFlagsFilter from '@/utils/data_filters/WorksiteFlagsFilter';
+import FormDataFilter from '@/utils/data_filters/FormDataFilter';
+import WorksiteStatusGroupFilter from '@/utils/data_filters/WorksiteStatusGroupFilter';
+import WorksiteStatusFilter from '@/utils/data_filters/WorksiteStatusFilter';
+import WorksiteLocationsFilter from '@/utils/data_filters/WorksiteLocationsFilter';
+import WorksiteMissingWorkTypeFilter from '@/utils/data_filters/WorksiteMissingWorkTypeFilter';
+import WorksiteMyTeamFilter from '@/utils/data_filters/WorksiteMyTeamFilter';
+import SurvivorFilter from '@/utils/data_filters/SurvivorFilter';
+import WorksiteTeamsFilter from '@/utils/data_filters/WorksiteTeamsFilter';
+import WorksiteListsFilter from '@/utils/data_filters/WorksiteListsFilter';
+import WorksiteDatesFilter from '@/utils/data_filters/WorksiteDatesFilter';
+import { getStatusName } from '@/filters/index';
+import axios from 'axios';
+import BaseButton from '@/components/BaseButton.vue';
 
 export default defineComponent({
   name: 'WorksiteFilters',
-  components: { datepicker: LitepieDatepicker },
+  components: { BaseButton },
   props: {
     incident: {
       type: Object,
@@ -621,6 +706,7 @@ export default defineComponent({
       type: Boolean,
     },
   },
+  emits: ['updatedFilterLabels', 'updateFiltersCount', 'updatedFilters'],
 
   setup(props, { emit }) {
     const store = useStore();
@@ -632,11 +718,19 @@ export default defineComponent({
       statuses: new WorksiteStatusFilter('statuses', {}),
       locations: new WorksiteLocationsFilter('locations', {}),
       teams: new WorksiteTeamsFilter('teams', {}),
+      lists: new WorksiteListsFilter('lists', {
+        include_lists: [],
+        exclude_lists: [],
+      }),
       my_team: new WorksiteMyTeamFilter('my_team', {}),
       dates: new WorksiteDatesFilter('dates', {}),
       survivors: new SurvivorFilter('survivors', {}),
       missingWorkType: new WorksiteMissingWorkTypeFilter('missingWorkType', {}),
     });
+    const datePickerDefaultProps = reactive({
+      format: 'yyyy-MM-dd',
+      autoApply: true,
+    });
     const currentSection = ref('general');
     const expanded = ref({});
     const flagTypes = [
@@ -649,6 +743,8 @@ export default defineComponent({
       'flag.worksite_wrong_incident',
     ];
 
+    const lists = ref([]);
+
     const incidentTypes = computed(() => {
       if (props.incident && props.incident.form_fields) {
         const fieldsWithTypes = props.incident.form_fields.filter((field) => {
@@ -698,12 +794,16 @@ export default defineComponent({
     const datesCount = computed(() => {
       return filters.value.dates.getCount() || 0;
     });
+    const listsCount = computed(() => {
+      return filters.value.lists.getCount() || 0;
+    });
     const survivorCount = computed(() => {
       return filters.value.survivors.getCount() || 0;
     });
     const teams = computed(() => {
       return Team.all();
     });
+
     const filtersCount = computed(() => {
       return (
         fieldsCount.value +
@@ -716,7 +816,8 @@ export default defineComponent({
         teamsCount.value +
         survivorCount.value +
         datesCount.value +
-        myTeamCount.value
+        myTeamCount.value +
+        listsCount.value
       );
     });
     const allStatuses = computed(() => {
@@ -728,6 +829,8 @@ export default defineComponent({
       });
     });
 
+    const filterLabels = ref([]);
+
     watch(
       () => props.currentFilters,
       () => {
@@ -788,6 +891,13 @@ export default defineComponent({
             (props.currentFilters.teams && props.currentFilters.teams.data) ||
               {},
           ),
+          lists: new WorksiteListsFilter(
+            'lists',
+            (props.currentFilters.lists && props.currentFilters.lists.data) || {
+              include_lists: [],
+              exclude_lists: [],
+            },
+          ),
           missingWorkType: new WorksiteMissingWorkTypeFilter(
             'missingWorkType',
             (props.currentFilters.missingWorkType &&
@@ -795,7 +905,22 @@ export default defineComponent({
               {},
           ),
         };
+        filterLabels.value = Object.values(filters.value)
+          .map((filter) => {
+            return {
+              labels: filter.getFilterLabels(),
+              removeField: filter.removeField,
+            };
+          })
+          .filter((filter) => Object.keys(filter.labels).length > 0);
         emit('updateFiltersCount', filtersCount.value);
+        emit('updatedFilterLabels', filterLabels.value);
+        if (
+          props.currentFilters &&
+          Object.keys(props.currentFilters).length === 0
+        ) {
+          updateFilters();
+        }
       },
     );
 
@@ -859,6 +984,10 @@ export default defineComponent({
         statuses: new WorksiteStatusFilter('statuses', {}),
         locations: new WorksiteLocationsFilter('locations', {}),
         teams: new WorksiteTeamsFilter('teams', {}),
+        lists: new WorksiteListsFilter('lists', {
+          include_lists: [],
+          exclude_lists: [],
+        }),
         my_team: new WorksiteMyTeamFilter('my_team', {}),
         dates: new WorksiteDatesFilter('dates', {}),
         survivors: new SurvivorFilter('survivors', {}),
@@ -873,8 +1002,26 @@ export default defineComponent({
       if (Object.keys(props.currentFilters).length === 0) {
         clearAllFilters();
       }
+      getLists().then(() => {});
     });
 
+    async function getLists() {
+      const response = await axios.get(
+        `${import.meta.env.VITE_APP_API_BASE_URL}/lists`,
+        {
+          params: {
+            model: 'worksite_worksites',
+          },
+        },
+      );
+      lists.value = response.data.results.map((list) => {
+        return {
+          id: list.id,
+          name: list.name,
+        };
+      });
+    }
+
     return {
       filters,
       currentSection,
@@ -891,6 +1038,7 @@ export default defineComponent({
       teamsCount,
       myTeamCount,
       datesCount,
+      listsCount,
       survivorCount,
       teams,
       filtersCount,
@@ -901,6 +1049,9 @@ export default defineComponent({
       getFieldsForType,
       clearAllFilters,
       getStatusName,
+      filterLabels,
+      datePickerDefaultProps,
+      lists,
     };
   },
 });
diff --git a/src/components/work/WorksiteSearchAndFilters.vue b/src/components/work/WorksiteSearchAndFilters.vue
new file mode 100644
index 000000000..18c3dd10c
--- /dev/null
+++ b/src/components/work/WorksiteSearchAndFilters.vue
@@ -0,0 +1,84 @@
+<template>
+  <WorksiteSearchInput
+    :value="currentSearch"
+    data-testid="testWorksiteSearch"
+    icon="filters"
+    :icon-badge="filtersCount"
+    display-property="name"
+    :placeholder="$t('actions.search')"
+    size="medium"
+    skip-validation
+    use-recents
+    class="mx-4 py-1"
+    @selected-existing="$emit('selected-existing', $event)"
+    @input="
+      (value: string) => {
+        currentSearch = value;
+      }
+    "
+    @icon-clicked="showFilters"
+  />
+
+  <WorksiteFilters
+    ref="worksiteFilter"
+    :show="showingFilters"
+    :current-filters="initialFilters"
+    :incident="currentIncident"
+    :locations="organizationLocations"
+    @closed-filters="showingFilters = false"
+    @updated-filters="handleFilters"
+    @update-filters-count="filtersCount = $event"
+    @updated-filter-labels="$emit('updatedFilterLabels', $event)"
+  />
+</template>
+<script setup lang="ts">
+import WorksiteSearchInput from '@/components/work/WorksiteSearchInput.vue';
+import WorksiteFilters from '@/components/work/WorksiteFilters.vue';
+import { ref } from 'vue';
+
+defineProps({
+  initialFilters: {
+    type: Number,
+    required: true,
+  },
+  currentIncident: {
+    type: Number,
+    required: true,
+  },
+});
+
+const emit = defineEmits(
+  'selected-existing',
+  'updatedQuery',
+  'updatedFilters',
+  'closed-filters',
+  'update-filters-count',
+  'updatedFilterLabels',
+);
+
+const currentSearch = ref('');
+const showingFilters = ref(false);
+const filtersCount = ref<number>(0);
+const filters = ref<any>({});
+const appliedFilters = ref<any>({});
+
+const organizationLocations = ref([]);
+const showFilters = () => {
+  showingFilters.value = true;
+};
+function handleFilters(f) {
+  appliedFilters.value = {};
+  filters.value = f.filters;
+  Object.values(f.filters).forEach((filter: any) => {
+    appliedFilters.value = {
+      ...appliedFilters.value,
+      ...filter.packFunction(),
+    };
+  });
+  filtersCount.value = f.count;
+
+  showingFilters.value = false;
+  emit('updatedQuery', appliedFilters.value);
+  emit('updatedFilters', filters.value);
+}
+</script>
diff --git a/src/components/work/WorksiteSearchInput.vue b/src/components/work/WorksiteSearchInput.vue
index c06a0fb28..8f035ae4d 100644
--- a/src/components/work/WorksiteSearchInput.vue
+++ b/src/components/work/WorksiteSearchInput.vue
@@ -8,6 +8,9 @@
         :required="required"
         :tooltip="tooltip"
         data-testid="testWorksiteSearchInputSearch"
+        :input-style="{
+          'border-right': icon || tooltip ? '0' : '1px solid #dadada',
+        }"
         @update:model-value="debouncedSearch"
         @input.stop=""
         @focus="onFocus"
@@ -69,14 +72,21 @@
     </div>
     <div
       v-if="icon || tooltip"
-      class="icon-container flex items-center justify-center"
-      :class="iconClasses"
+      class="icon-container flex items-center justify-center relative"
     >
       <ccu-icon
         :alt="$t('worksiteSearchInput.search_help')"
         :type="tooltip ? 'info' : icon"
         size="small"
+        :action="() => $emit('iconClicked')"
       />
+      <badge
+        v-if="iconBadge > 0"
+        width="12px"
+        height="12px"
+        class="ml-2 text-black bg-primary-light absolute top-1 right-1 text-xs"
+        >{{ iconBadge }}</badge
+      >
     </div>
   </div>
 </template>
@@ -94,6 +104,7 @@ import Worksite from '@/models/Worksite';
 import { getWorkTypeImage } from '@/filters/index';
 import { useRecentWorksites } from '@/hooks/useRecentWorksites';
 import type WorkType from '@/models/WorkType';
+import Badge from '@/components/Badge.vue';
 
 type GeocoderResult = Awaited<
   ReturnType<typeof GeocoderService.getMatchingAddresses>
@@ -106,7 +117,7 @@ interface WorksiteSearchResult {
 
 export default defineComponent({
   name: 'WorksiteSearchInput',
-  components: { BaseInput },
+  components: { Badge, BaseInput },
   props: {
     value: {
       type: String,
@@ -152,6 +163,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    iconBadge: {
+      type: Number,
+      default: 0,
+    },
   },
   emits: [
     'input',
@@ -160,6 +175,7 @@ export default defineComponent({
     'selectedGeocode',
     'selectedExisting',
     'clearSuggestions',
+    'iconClicked',
   ],
   setup(props, { emit }) {
     const { currentUser } = useCurrentUser();
diff --git a/src/pages/Work.vue b/src/pages/Work.vue
index 663c035e4..7f77cf0a9 100644
--- a/src/pages/Work.vue
+++ b/src/pages/Work.vue
@@ -403,22 +403,14 @@
                   {{ numeral(allWorksiteCount) }}
                 </span>
               </span>
-              <WorksiteSearchInput
-                :value="currentSearch"
-                data-testid="testWorksiteSearch"
-                icon="search"
-                display-property="name"
-                :placeholder="$t('actions.search')"
-                size="medium"
-                skip-validation
-                use-recents
-                class="mx-4 py-1"
+              <WorksiteSearchAndFilters
+                :key="currentIncidentId"
+                :current-incident="String(currentIncidentId)"
+                :initial-filters="filters"
                 @selected-existing="handleSelectedExisting"
-                @input="
-                  (value: string) => {
-                    currentSearch = value;
-                  }
-                "
+                @updated-query="onUpdateQuery"
+                @updated-filters="onUpdateFilters"
+                @updated-filter-labels="updateFilterLabels"
               />
               <WorksiteActions
                 v-if="currentIncidentId"
@@ -452,6 +444,37 @@
               />
             </div>
           </div>
+          <div v-if="filterLabels.length > 0" class="mx-4">
+            <div class="flex gap-3">
+              <span class="font-bold">{{ $t('~~Current Filters') }}</span>
+              <base-button
+                class="underline"
+                type="link"
+                :action="() => (filters = {})"
+              >
+                {{ $t('~~Clear All') }}
+              </base-button>
+            </div>
+            <div class="applied-filters flex flex-wrap justify-start gap-2">
+              <template v-for="(filter, key) in filterLabels">
+                <template
+                  v-for="(label, identifier) in filter.labels"
+                  :key="key + identifier"
+                >
+                  <tag
+                    :data-testid="`testFilters${label}Label`"
+                    class="p-1.5 my-1"
+                    :style="{
+                      fontSize: '0.85rem',
+                    }"
+                  >
+                    {{ label }}
+                  </tag>
+                </template>
+              </template>
+            </div>
+          </div>
+
           <tag
             v-if="overDueFilterLabel"
             data-testid="testOverDueFilterLabelDiv"
@@ -968,10 +991,14 @@ import WorksiteFeed from '@/components/WorksiteFeed.vue';
 import { useRecentWorksites } from '@/hooks/useRecentWorksites';
 import useAcl from '@/hooks/useAcl';
 import ListDropdown from '@/pages/lists/ListDropdown.vue';
+import WorksiteSearchAndFilters from '@/components/work/WorksiteSearchAndFilters.vue';
+import BaseButton from '@/components/BaseButton.vue';
 
 export default defineComponent({
   name: 'Work',
   components: {
+    BaseButton,
+    WorksiteSearchAndFilters,
     ListDropdown,
     WorksiteFeed,
     WorksiteView,
@@ -1064,6 +1091,7 @@ export default defineComponent({
     const selectedChat = ref<any>({ id: 2 });
     const filterQuery = ref<any>({});
     const filters = ref<any>({});
+    const filterLabels = ref<any>([]);
     const mostRecentlySavedWorksite = ref<any>(null);
     const selectedTableItems = ref<Set<number>>(new Set());
     const availableWorkTypes = ref({});
@@ -1864,6 +1892,10 @@ export default defineComponent({
       });
     }
 
+    function updateFilterLabels(labels: any) {
+      filterLabels.value = labels;
+    }
+
     watch(
       () => worksiteQuery.value,
       (value, previousValue) => {
@@ -2130,6 +2162,8 @@ export default defineComponent({
       portal,
       currentUserLocation,
       can: $can,
+      updateFilterLabels,
+      filterLabels,
     };
   },
 });
diff --git a/src/pages/lists/NewListForm.vue b/src/pages/lists/NewListForm.vue
index 6f7dddad3..1f3a4768a 100644
--- a/src/pages/lists/NewListForm.vue
+++ b/src/pages/lists/NewListForm.vue
@@ -66,7 +66,7 @@ const props = defineProps({
 const newList = ref<NewList>({
   name: '',
   description: '',
-  model: '',
+  model: props.model,
   shared: '',
   permissions: '',
   incident: undefined,
diff --git a/src/utils/data_filters/FormDataFilter.ts b/src/utils/data_filters/FormDataFilter.ts
index 85a7c3ab8..ce58be4c0 100644
--- a/src/utils/data_filters/FormDataFilter.ts
+++ b/src/utils/data_filters/FormDataFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import Filter from './Filter';
 
 export default class FormDataFilter extends Filter {
@@ -30,7 +30,7 @@ export default class FormDataFilter extends Filter {
     for (const [key] of Object.entries(this.data).filter(([, value]) => {
       return Boolean(value);
     })) {
-      const localeMessages = useI18n().t(`formLabels.${key}`);
+      const localeMessages = i18n.global.t(`formLabels.${key}`);
       labels[key] = `${localeMessages}`;
     }
 
diff --git a/src/utils/data_filters/SurvivorFilter.ts b/src/utils/data_filters/SurvivorFilter.ts
index 91fd5f14c..355bde896 100644
--- a/src/utils/data_filters/SurvivorFilter.ts
+++ b/src/utils/data_filters/SurvivorFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import Filter from './Filter';
 
 export default class SurvivorFilter extends Filter {
@@ -25,7 +25,7 @@ export default class SurvivorFilter extends Filter {
     }
 
     return {
-      my_team: useI18n().t('actions.member_of_my_org'),
+      my_team: i18n.global.t('actions.member_of_my_org'),
     };
   }
 
diff --git a/src/utils/data_filters/UserInvitedByFilter.ts b/src/utils/data_filters/UserInvitedByFilter.ts
index cc967ffd8..e627f22f3 100644
--- a/src/utils/data_filters/UserInvitedByFilter.ts
+++ b/src/utils/data_filters/UserInvitedByFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import User from '../../models/User';
 import Filter from './Filter';
 
@@ -21,7 +21,7 @@ export default class UserInvitedByFilter extends Filter {
     const labels: Record<any, any> = {};
     [...this.data].forEach((user: any) => {
       const { id, full_name } = user;
-      labels[id] = useI18n().t('userInvitedBy.invited_by', {
+      labels[id] = i18n.global.t('userInvitedBy.invited_by', {
         full_name,
       });
     });
diff --git a/src/utils/data_filters/WorksiteDatesFilter.ts b/src/utils/data_filters/WorksiteDatesFilter.ts
index ce778e648..b7cc0c24a 100644
--- a/src/utils/data_filters/WorksiteDatesFilter.ts
+++ b/src/utils/data_filters/WorksiteDatesFilter.ts
@@ -1,6 +1,6 @@
 import moment from 'moment';
 import { omitBy, isNull } from 'lodash';
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import Filter from './Filter';
 
 interface WorksiteDatesFilterPacked {
@@ -44,25 +44,25 @@ export default class WorksiteDatesFilter extends Filter {
       {
         created_start:
           this.data.created && moment(this.data.created[0]).isValid()
-            ? `${useI18n().t('worksiteFilters.from')}: ${moment(
+            ? `${i18n.global.t('worksiteFilters.from')}: ${moment(
                 this.data.created[0],
               ).format('YYYY-MM-DD')}`
             : null,
         created_end:
           this.data.created && moment(this.data.created[1]).isValid()
-            ? `${useI18n().t('worksiteFilters.to')}: ${moment(
+            ? `${i18n.global.t('worksiteFilters.to')}: ${moment(
                 this.data.created[1],
               ).format('YYYY-MM-DD')}`
             : null,
         updated_start:
           this.data.updated && moment(this.data.updated[0]).isValid()
-            ? `${useI18n().t('worksiteFilters.from')}: ${moment(
+            ? `${i18n.global.t('worksiteFilters.from')}: ${moment(
                 this.data.updated[0],
               ).format('YYYY-MM-DD')}`
             : null,
         updated_end:
           this.data.updated && moment(this.data.updated[1]).isValid()
-            ? `${useI18n().t('worksiteFilters.to')}: ${moment(
+            ? `${i18n.global.t('worksiteFilters.to')}: ${moment(
                 this.data.updated[1],
               ).format('YYYY-MM-DD')}`
             : null,
diff --git a/src/utils/data_filters/WorksiteFieldsFilter.ts b/src/utils/data_filters/WorksiteFieldsFilter.ts
index 0e1c94628..aa0fe30e5 100644
--- a/src/utils/data_filters/WorksiteFieldsFilter.ts
+++ b/src/utils/data_filters/WorksiteFieldsFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import { getWorkTypeName } from '../../filters';
 import Filter from './Filter';
 
@@ -33,7 +33,7 @@ export default class WorksiteFieldsFilter extends Filter {
     for (const [key] of Object.entries(this.data).filter(([, value]) => {
       return Boolean(value);
     })) {
-      labels[key] = `${useI18n().t(
+      labels[key] = `${i18n.global.t(
         'worksiteFilters.work_type',
       )}: ${getWorkTypeName(key)}`;
     }
diff --git a/src/utils/data_filters/WorksiteFlagsFilter.ts b/src/utils/data_filters/WorksiteFlagsFilter.ts
index 0c6f32754..583994a9b 100644
--- a/src/utils/data_filters/WorksiteFlagsFilter.ts
+++ b/src/utils/data_filters/WorksiteFlagsFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import Filter from './Filter';
 
 export default class WorksiteFlagsFilter extends Filter {
@@ -30,7 +30,7 @@ export default class WorksiteFlagsFilter extends Filter {
     for (const [key] of Object.entries(this.data).filter(([, value]) => {
       return Boolean(value);
     })) {
-      labels[key] = `${useI18n().t('worksiteFilters.flag')}: ${useI18n().t(
+      labels[key] = `${i18n.global.t('worksiteFilters.flag')}: ${i18n.global.t(
         key,
       )}`;
     }
diff --git a/src/utils/data_filters/WorksiteListsFilter.ts b/src/utils/data_filters/WorksiteListsFilter.ts
new file mode 100644
index 000000000..20c9e90cd
--- /dev/null
+++ b/src/utils/data_filters/WorksiteListsFilter.ts
@@ -0,0 +1,49 @@
+import { i18n } from '@/modules/i18n';
+import Filter from './Filter';
+
+export default class WorksiteListsFilter extends Filter {
+  packFunction() {
+    const packed = {} as Record<string, any>;
+
+    if (this.data.include_lists.length > 0) {
+      packed.include_lists = this.data.include_lists.map((l) => l.id).join(',');
+    }
+
+    if (this.data.exclude_lists.length > 0) {
+      packed.exclude_lists = this.data.exclude_lists.map((l) => l.id).join(',');
+    }
+
+    return packed;
+  }
+
+  getCount() {
+    if (!this.data) {
+      return 0;
+    }
+
+    return this.data.include_lists.length + this.data.exclude_lists.length;
+  }
+
+  getFilterLabels() {
+    const labels = {} as Record<string, string>;
+    for (const list of this.data.include_lists) {
+      labels[list.id] = `${i18n.global.t('~~List')}: ${list.name}`;
+    }
+
+    for (const list of this.data.exclude_lists) {
+      labels[list.id] = `${i18n.global.t('~~-List')}: ${list.name}`;
+    }
+
+    return labels;
+  }
+
+  removeField(identifier: string) {
+    this.data.include_lists = this.data.include_lists.filter(
+      (list) => String(list.id) !== identifier,
+    );
+    this.data.exclude_lists = this.data.exclude_lists.filter(
+      (list) => String(list.id) !== identifier,
+    );
+    this.data = { ...this.data };
+  }
+}
diff --git a/src/utils/data_filters/WorksiteLocationsFilter.ts b/src/utils/data_filters/WorksiteLocationsFilter.ts
index 0713c061c..c15538b01 100644
--- a/src/utils/data_filters/WorksiteLocationsFilter.ts
+++ b/src/utils/data_filters/WorksiteLocationsFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import User from '../../models/User';
 import { store } from '../../store';
 import Filter from './Filter';
@@ -47,11 +47,13 @@ export default class UserLocationsFilter extends Filter {
     })) {
       labels[key] = `Location: ${key}`;
       if (key === 'organization_primary_location') {
-        labels[key] = useI18n().t('worksiteFilters.in_primary_response_area');
+        labels[key] = i18n.global.t('worksiteFilters.in_primary_response_area');
       }
 
       if (key === 'organization_secondary_location') {
-        labels[key] = useI18n().t('worksiteFilters.in_secondary_response_area');
+        labels[key] = i18n.global.t(
+          'worksiteFilters.in_secondary_response_area',
+        );
       }
     }
 
diff --git a/src/utils/data_filters/WorksiteMissingWorkTypeFilter.ts b/src/utils/data_filters/WorksiteMissingWorkTypeFilter.ts
index a6693bcd2..eed6d9078 100644
--- a/src/utils/data_filters/WorksiteMissingWorkTypeFilter.ts
+++ b/src/utils/data_filters/WorksiteMissingWorkTypeFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import { snakeToTitleCase } from '../../filters';
 import Filter from './Filter';
 
@@ -28,7 +28,7 @@ export default class WorksiteMissingWorkTypeFilter extends Filter {
     for (const [key] of Object.entries(this.data).filter(([, value]) => {
       return Boolean(value);
     })) {
-      labels[key] = `${useI18n().t(
+      labels[key] = `${i18n.global.t(
         'worksiteFilters.status',
       )}: ${snakeToTitleCase(key)}`;
     }
diff --git a/src/utils/data_filters/WorksiteMyTeamFilter.ts b/src/utils/data_filters/WorksiteMyTeamFilter.ts
index 70558e18f..db52b4de0 100644
--- a/src/utils/data_filters/WorksiteMyTeamFilter.ts
+++ b/src/utils/data_filters/WorksiteMyTeamFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import Filter from './Filter';
 
 export default class WorksiteMyTeamFilter extends Filter {
@@ -25,7 +25,7 @@ export default class WorksiteMyTeamFilter extends Filter {
     }
 
     return {
-      my_team: useI18n().t('worksiteFilters.my_team'),
+      my_team: i18n.global.t('worksiteFilters.my_team'),
     };
   }
 
diff --git a/src/utils/data_filters/WorksiteStatusFilter.ts b/src/utils/data_filters/WorksiteStatusFilter.ts
index 0e4c903f6..e5cc9aa52 100644
--- a/src/utils/data_filters/WorksiteStatusFilter.ts
+++ b/src/utils/data_filters/WorksiteStatusFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import { snakeToTitleCase } from '../../filters';
 import Filter from './Filter';
 
@@ -33,7 +33,7 @@ export default class WorksiteStatusFilter extends Filter {
     for (const [key] of Object.entries(this.data).filter(([, value]) => {
       return Boolean(value);
     })) {
-      labels[key] = `${useI18n().t(
+      labels[key] = `${i18n.global.t(
         'worksiteFilters.status',
       )}: ${snakeToTitleCase(key)}`;
     }
diff --git a/src/utils/data_filters/WorksiteStatusGroupFilter.ts b/src/utils/data_filters/WorksiteStatusGroupFilter.ts
index 46bba6233..a0116685a 100644
--- a/src/utils/data_filters/WorksiteStatusGroupFilter.ts
+++ b/src/utils/data_filters/WorksiteStatusGroupFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import { snakeToTitleCase } from '../../filters';
 import enums from '../../store/modules/enums';
 import User from '../../models/User';
@@ -61,7 +61,7 @@ export default class WorksiteStatusGroupFilter extends Filter {
     for (const [key] of Object.entries(this.data).filter(([, value]) => {
       return Boolean(value);
     })) {
-      labels[key] = `${useI18n().t(
+      labels[key] = `${i18n.global.t(
         'worksiteFilters.status',
       )}: ${snakeToTitleCase(key)}`;
     }
diff --git a/src/utils/data_filters/WorksiteTeamsFilter.ts b/src/utils/data_filters/WorksiteTeamsFilter.ts
index 311510423..a8f820489 100644
--- a/src/utils/data_filters/WorksiteTeamsFilter.ts
+++ b/src/utils/data_filters/WorksiteTeamsFilter.ts
@@ -1,4 +1,4 @@
-import { useI18n } from 'vue-i18n';
+import { i18n } from '@/modules/i18n';
 import Team from '../../models/Team';
 import Filter from './Filter';
 
@@ -31,7 +31,7 @@ export default class WorksiteTeamsFilter extends Filter {
     for (const [key] of Object.entries(this.data).filter(([, value]) => {
       return Boolean(value);
     })) {
-      labels[key] = `${useI18n().t('worksiteFilters.teams')}: ${Team.find(key)
+      labels[key] = `${i18n.global.t('worksiteFilters.teams')}: ${Team.find(key)
         ?.name}`;
     }