diff --git a/client/src/components/Grid/GridElements/GridDatasets.vue b/client/src/components/Grid/GridElements/GridDatasets.vue
index 005f5d96ce99..7a3092dcfca3 100644
--- a/client/src/components/Grid/GridElements/GridDatasets.vue
+++ b/client/src/components/Grid/GridElements/GridDatasets.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import axios from "axios";
-import { onMounted, type Ref, ref } from "vue";
+import { onMounted, type Ref, ref, watch } from "vue";
 
 import { withPrefix } from "@/utils/redirect";
 import { rethrowSimple } from "@/utils/simple-error";
@@ -28,6 +28,7 @@ interface HistoryStats {
 const historyStats: Ref<HistoryStats | null> = ref(null);
 
 async function getCounts() {
+    historyStats.value = null;
     if (props.historyId) {
         try {
             const { data } = await axios.get(
@@ -43,6 +44,11 @@ async function getCounts() {
 onMounted(() => {
     getCounts();
 });
+
+watch(
+    () => props.historyId,
+    () => getCounts()
+);
 </script>
 
 <template>
diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 11ba2e2387be..a8a8bae298f3 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -15,6 +15,7 @@ import GridLink from "./GridElements/GridLink.vue";
 import GridOperations from "./GridElements/GridOperations.vue";
 import GridText from "./GridElements/GridText.vue";
 import FilterMenu from "@/components/Common/FilterMenu.vue";
+import Heading from "@/components/Common/Heading.vue";
 import SharingIndicators from "@/components/Indices/SharingIndicators.vue";
 import LoadingSpan from "@/components/LoadingSpan.vue";
 import StatelessTags from "@/components/TagsMultiselect/StatelessTags.vue";
@@ -235,35 +236,35 @@ watch(operationMessage, () => {
     <div :id="gridConfig.id" class="d-flex flex-column overflow-auto">
         <BAlert v-if="!!errorMessage" variant="danger" show>{{ errorMessage }}</BAlert>
         <BAlert v-if="!!operationMessage" :variant="operationStatus" fade show>{{ operationMessage }}</BAlert>
-        <div class="grid-header d-flex justify-content-between pb-2">
-            <div>
-                <h1 class="m-0" data-description="grid title">
-                    {{ gridConfig.title }}
-                </h1>
-                <FilterMenu
-                    class="py-2"
-                    :name="gridConfig.plural"
-                    :placeholder="`search ${gridConfig.plural.toLowerCase()}`"
-                    :filter-class="gridConfig.filtering"
-                    :filter-text.sync="filterText"
-                    :loading="loading"
-                    :show-advanced.sync="showAdvanced"
-                    @on-backend-filter="onSearch" />
-                <hr v-if="showAdvanced" />
-            </div>
-            <div v-if="!showAdvanced" class="py-3">
-                <BButton
-                    v-for="(action, actionIndex) in gridConfig.actions"
-                    :key="actionIndex"
-                    class="m-1"
-                    size="sm"
-                    variant="primary"
-                    :data-description="`grid action ${action.title.toLowerCase()}`"
-                    @click="action.handler()">
-                    <Icon :icon="action.icon" class="mr-1" />
-                    <span v-localize>{{ action.title }}</span>
-                </BButton>
+        <div class="grid-header d-flex justify-content-between pb-2 flex-column">
+            <div class="d-flex">
+                <Heading h1 separator inline size="xl" class="flex-grow-1 m-0" data-description="grid title">
+                    <span v-localize>{{ gridConfig.title }}</span>
+                </Heading>
+                <div class="d-flex justify-content-between">
+                    <BButton
+                        v-for="(action, actionIndex) in gridConfig.actions"
+                        :key="actionIndex"
+                        class="m-1"
+                        size="sm"
+                        variant="primary"
+                        :data-description="`grid action ${action.title.toLowerCase()}`"
+                        @click="action.handler()">
+                        <Icon :icon="action.icon" class="mr-1" />
+                        <span v-localize>{{ action.title }}</span>
+                    </BButton>
+                </div>
             </div>
+            <FilterMenu
+                class="py-2"
+                :name="gridConfig.plural"
+                :placeholder="`search ${gridConfig.plural.toLowerCase()}`"
+                :filter-class="gridConfig.filtering"
+                :filter-text.sync="filterText"
+                :loading="loading"
+                :show-advanced.sync="showAdvanced"
+                @on-backend-filter="onSearch" />
+            <hr v-if="showAdvanced" />
         </div>
         <LoadingSpan v-if="loading" />
         <BAlert v-else-if="!isAvailable" variant="info" show>
diff --git a/client/src/components/Grid/configs/historiesPublished.ts b/client/src/components/Grid/configs/historiesPublished.ts
new file mode 100644
index 000000000000..1c5163c5f2a2
--- /dev/null
+++ b/client/src/components/Grid/configs/historiesPublished.ts
@@ -0,0 +1,112 @@
+import { faEye } from "@fortawesome/free-solid-svg-icons";
+import { useEventBus } from "@vueuse/core";
+
+import { historiesFetcher } from "@/api/histories";
+import Filtering, { contains, expandNameTag, type ValidFilter } from "@/utils/filtering";
+import _l from "@/utils/localization";
+
+import type { FieldArray, GridConfig } from "./types";
+
+const { emit } = useEventBus<string>("grid-router-push");
+
+/**
+ * Local types
+ */
+type HistoryEntry = Record<string, unknown>;
+type SortKeyLiteral = "name" | "update_time" | undefined;
+
+/**
+ * Request and return data from server
+ */
+async function getData(offset: number, limit: number, search: string, sort_by: string, sort_desc: boolean) {
+    const { data, headers } = await historiesFetcher({
+        limit,
+        offset,
+        search,
+        sort_by: sort_by as SortKeyLiteral,
+        sort_desc,
+        show_own: false,
+        show_published: true,
+        show_shared: false,
+    });
+    const totalMatches = parseInt(headers.get("total_matches") ?? "0");
+    return [data, totalMatches];
+}
+
+/**
+ * Declare columns to be displayed
+ */
+const fields: FieldArray = [
+    {
+        key: "name",
+        title: "Name",
+        type: "operations",
+        operations: [
+            {
+                title: "View",
+                icon: faEye,
+                condition: (data: HistoryEntry) => !data.deleted,
+                handler: (data: HistoryEntry) => {
+                    emit(`/histories/view?id=${data.id}`);
+                },
+            },
+        ],
+    },
+    {
+        key: "annotation",
+        title: "Annotation",
+        type: "text",
+    },
+    {
+        key: "id",
+        title: "Size",
+        type: "datasets",
+    },
+    {
+        key: "tags",
+        title: "Tags",
+        type: "tags",
+        disabled: true,
+    },
+    {
+        key: "update_time",
+        title: "Updated",
+        type: "date",
+    },
+    {
+        key: "username",
+        title: "Username",
+        type: "text",
+    },
+];
+
+/**
+ * Declare filter options
+ */
+const validFilters: Record<string, ValidFilter<string | boolean | undefined>> = {
+    name: { placeholder: "name", type: String, handler: contains("name"), menuItem: true },
+    user: { placeholder: "user", type: String, handler: contains("username"), menuItem: true },
+    tag: {
+        placeholder: "tag(s)",
+        type: "MultiTags",
+        handler: contains("tag", "tag", expandNameTag),
+        menuItem: true,
+    },
+};
+
+/**
+ * Grid configuration
+ */
+const gridConfig: GridConfig = {
+    id: "histories-published-grid",
+    fields: fields,
+    filtering: new Filtering(validFilters, undefined, false, false),
+    getData: getData,
+    plural: "Histories",
+    sortBy: "update_time",
+    sortDesc: true,
+    sortKeys: ["name", "update_time", "username"],
+    title: "Published Histories",
+};
+
+export default gridConfig;
diff --git a/client/src/components/History/HistoryPublishedList.vue b/client/src/components/History/HistoryPublishedList.vue
deleted file mode 100644
index 3a98f71557a3..000000000000
--- a/client/src/components/History/HistoryPublishedList.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<script setup lang="ts">
-import { useInfiniteScroll } from "@vueuse/core";
-import { BAlert, BOverlay, BTable } from "bootstrap-vue";
-import { computed, onMounted, onUnmounted, ref, watch } from "vue";
-import { RouterLink } from "vue-router";
-
-import type { HistoryDetailed, HistorySummary } from "@/api";
-import { updateTags } from "@/api/tags";
-import { useAnimationFrameScroll } from "@/composables/sensors/animationFrameScroll";
-import Filtering, { compare, contains, equals, expandNameTag, toDate } from "@/utils/filtering";
-
-import { getPublishedHistories } from "./services";
-
-import FilterMenu from "@/components/Common/FilterMenu.vue";
-import Heading from "@/components/Common/Heading.vue";
-import LoadingSpan from "@/components/LoadingSpan.vue";
-import StatelessTags from "@/components/TagsMultiselect/StatelessTags.vue";
-import ScrollToTopButton from "@/components/ToolsList/ScrollToTopButton.vue";
-import UtcDate from "@/components/UtcDate.vue";
-
-const LIMIT = 50;
-
-type History = HistoryDetailed | HistorySummary;
-
-const validFilters = {
-    name: { placeholder: "name", type: String, handler: contains("name"), menuItem: true },
-    annotation: { placeholder: "annotation", type: String, handler: contains("annotation"), menuItem: true },
-    tag: { placeholder: "tag", type: String, handler: contains("tags", "tag", expandNameTag), menuItem: true },
-    user: { placeholder: "user name", type: String, handler: contains("username"), menuItem: true },
-    user_eq: { handler: equals("username"), menuItem: false },
-    update_time: {
-        placeholder: "updated time",
-        type: Date,
-        handler: compare("update_time", "le", toDate),
-        isRangeInput: true,
-        menuItem: true,
-    },
-    update_time_ge: { handler: compare("update_time", "ge", toDate), menuItem: false },
-    update_time_le: { handler: compare("update_time", "le", toDate), menuItem: false },
-};
-
-const filters = new Filtering(validFilters);
-
-const props = defineProps({
-    fUsername: {
-        type: String,
-        required: false,
-        default: null,
-    },
-});
-
-const offset = ref<{ [key: string]: number | null }>({ "-update_time-true": 0 });
-const allHistories = ref<History[]>([]);
-const results = ref<History[]>([]);
-const error = ref(null);
-const loading = ref(false);
-const sortDesc = ref(true);
-const filterText = ref("");
-const showAdvanced = ref(false);
-const sortBy = ref("update_time");
-const scrollableDiv = ref<HTMLElement | null>(null);
-const { scrollTop } = useAnimationFrameScroll(scrollableDiv);
-const loadedItemIds = ref(new Set());
-
-const noItems = computed(() => !loading.value && allHistories.value.length === 0 && !filterText.value);
-const noResults = computed(() => !loading.value && results.value.length === 0 && filterText.value);
-const allLoaded = computed(() => {
-    return noResults.value === false && offset.value[getOffsetKey(sortBy.value, sortDesc.value)] === null;
-});
-
-const fields = computed(() => [
-    { key: "name", sortable: !loading.value },
-    { key: "annotation", sortable: false },
-    { label: "Owner", key: "username", sortable: false },
-    { label: "Tags", key: "tags", sortable: false },
-    { label: "Last Updated", key: "update_time", sortable: !loading.value },
-]);
-
-const updateFilter = (newVal: string) => {
-    filterText.value = newVal.trim();
-};
-
-const setFilter = (filter: string, tag: string) => {
-    updateFilter(filters.setFilterValue(filterText.value, filter, tag));
-};
-
-const onTagsUpdate = (newTags: string[], row: any) => {
-    row.item.tags = newTags;
-    updateTags(row.item.id, "History", row.item.tags);
-};
-
-const scrollToTop = () => {
-    scrollableDiv.value?.scrollTo({ top: 0, behavior: "smooth" });
-};
-
-const sortAndFilterHistories = () => {
-    allHistories.value = allHistories.value.sort((a, b) => {
-        const aVal = String(a[sortBy.value]).trim();
-        const bVal = String(b[sortBy.value]).trim();
-        if (!sortDesc.value) {
-            return Number(aVal) - Number(bVal);
-        } else {
-            return Number(bVal) - Number(aVal);
-        }
-    });
-
-    if (filterText.value) {
-        const currFilters = filters.getFiltersForText(filterText.value);
-        results.value = allHistories.value.filter((history) => {
-            if (!filters.testFilters(currFilters, history)) {
-                return false;
-            }
-            return true;
-        });
-    } else {
-        // no filter
-        results.value = allHistories.value;
-    }
-};
-
-function getOffsetKey(sort_by: string, sort_desc: boolean): string {
-    return `${filters.getQueryString(filterText.value)}-${sort_by}-${sort_desc}`;
-}
-
-async function load() {
-    if (loading.value) {
-        return;
-    }
-    loading.value = true;
-    if (allLoaded.value) {
-        sortAndFilterHistories();
-        loading.value = false;
-        error.value = null;
-        return;
-    }
-
-    // Define offsetKey in offset ref if it doesn't exist
-    const currOffsetKey = getOffsetKey(sortBy.value, sortDesc.value);
-    let currentOffset = offset.value[currOffsetKey];
-    if (currentOffset === undefined) {
-        offset.value[currOffsetKey] = 0;
-        currentOffset = 0;
-    }
-
-    await getPublishedHistories(LIMIT, currentOffset, sortBy.value, sortDesc.value, filterText.value, filters)
-        .then((data) => {
-            // add all new incoming histories to allHistories
-            const newData = data.filter((item) => !loadedItemIds.value.has(item.id)) as History[];
-            allHistories.value = [...allHistories.value, ...newData];
-            newData.forEach((item) => loadedItemIds.value.add(item.id));
-
-            // sort and filter allHistories containing new histories
-            sortAndFilterHistories();
-
-            // ------ UPDATE OFFSET ------
-            if (results.value.length > Number(currentOffset) - 1 && data.length >= 50) {
-                const addToOffset = filterText.value ? 1 : 0;
-                offset.value[currOffsetKey] = results.value.length === 0 ? 0 : results.value.length + addToOffset;
-            } else {
-                // All items loaded for current filter/offsetKey
-                offset.value[getOffsetKey("update_time", true)] = null;
-                offset.value[getOffsetKey("update_time", false)] = null;
-                offset.value[getOffsetKey("name", true)] = null;
-                offset.value[getOffsetKey("name", false)] = null;
-            }
-            // ---------------------------
-            error.value = null;
-        })
-        .catch((error) => {
-            error.value = error;
-        })
-        .finally(() => {
-            loading.value = false;
-        });
-}
-
-onMounted(async () => {
-    if (props.fUsername) {
-        filterText.value = filters.getFilterText({ user_eq: props.fUsername });
-    }
-    await load();
-    useInfiniteScroll(scrollableDiv.value, () => load());
-});
-
-onUnmounted(() => {
-    // Remove the infinite scrolling behavior
-    useInfiniteScroll(scrollableDiv.value, () => {});
-});
-
-watch([filterText, sortBy, sortDesc], async () => {
-    await load();
-});
-</script>
-
-<template>
-    <section id="published-histories" class="d-flex flex-column position-relative overflow-hidden">
-        <Heading h1>Published Histories</Heading>
-
-        <BAlert v-if="noItems" variant="info" show>No published histories found.</BAlert>
-
-        <div v-else>
-            <FilterMenu
-                name="Published Histories"
-                :placeholder="'Search by name or use the advanced filtering options' | localize"
-                :filter-class="filters"
-                :filter-text.sync="filterText"
-                :loading="loading"
-                :show-advanced.sync="showAdvanced" />
-
-            <BAlert v-if="noResults || error" :variant="error ? 'danger' : 'info'" show>
-                <div>
-                    No matching entries found for: <span class="font-weight-bold">{{ filterText }}</span>
-                </div>
-                <div v-if="error">
-                    <i>{{ error }}</i>
-                </div>
-            </BAlert>
-
-            <BAlert v-if="results.length === 0 && loading" variant="info" show>
-                <LoadingSpan message="Loading published histories" />
-            </BAlert>
-        </div>
-
-        <div ref="scrollableDiv" class="overflow-auto">
-            <BTable
-                v-if="results.length"
-                id="published-histories-table"
-                no-sort-reset
-                striped
-                :fields="fields"
-                :items="results"
-                :sort-by.sync="sortBy"
-                :sort-desc.sync="sortDesc">
-                <template v-slot:cell(name)="row">
-                    <RouterLink :to="`/published/history?id=${row.item.id}`">
-                        {{ row.item.name }}
-                    </RouterLink>
-                </template>
-
-                <template v-slot:cell(username)="row">
-                    <a
-                        href="#"
-                        class="published-histories-username-link"
-                        @click="setFilter('user_eq', row.item.username)">
-                        {{ row.item.username }}
-                    </a>
-                </template>
-
-                <template v-slot:cell(tags)="row">
-                    <StatelessTags
-                        clickable
-                        :value="row.item.tags"
-                        :disabled="true"
-                        @input="(tags) => onTagsUpdate(tags, row)"
-                        @tag-click="(tag) => setFilter('tag', tag)" />
-                </template>
-
-                <template v-slot:cell(update_time)="data">
-                    <UtcDate v-if="data.value" :date="data.value" mode="elapsed" />
-                    <span v-else> - </span>
-                </template>
-            </BTable>
-
-            <div v-if="allLoaded" class="list-end my-2">- End of search results -</div>
-
-            <BOverlay :show="loading" opacity="0.5" />
-
-            <ScrollToTopButton :offset="scrollTop" @click="scrollToTop" />
-        </div>
-    </section>
-</template>
-
-<style lang="scss">
-@import "theme/blue.scss";
-.list-end {
-    width: 100%;
-    text-align: center;
-    color: $text-light;
-}
-</style>
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index ce3a76b4386c..e8312f3814c0 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -8,13 +8,13 @@ import DatasetDetails from "components/DatasetInformation/DatasetDetails";
 import DatasetError from "components/DatasetInformation/DatasetError";
 import FormGeneric from "components/Form/FormGeneric";
 import historiesGridConfig from "components/Grid/configs/histories";
+import historiesPublishedGridConfig from "components/Grid/configs/historiesPublished";
 import historiesSharedGridConfig from "components/Grid/configs/historiesShared";
 import visualizationsGridConfig from "components/Grid/configs/visualizations";
 import visualizationsPublishedGridConfig from "components/Grid/configs/visualizationsPublished";
 import GridList from "components/Grid/GridList";
 import HistoryExportTasks from "components/History/Export/HistoryExport";
 import HistoryPublished from "components/History/HistoryPublished";
-import HistoryPublishedList from "components/History/HistoryPublishedList";
 import HistoryView from "components/History/HistoryView";
 import HistoryMultipleView from "components/History/Multiple/MultipleView";
 import { HistoryExport } from "components/HistoryExport/index";
@@ -282,11 +282,9 @@ export function getRouter(Galaxy) {
                     },
                     {
                         path: "histories/list_published",
-                        component: HistoryPublishedList,
-                        props: (route) => {
-                            return {
-                                ...route.query,
-                            };
+                        component: GridList,
+                        props: {
+                            gridConfig: historiesPublishedGridConfig,
                         },
                     },
                     {
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 0f9c630d188f..70af6d07d63f 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -397,14 +397,13 @@ multi_history_panel:
 
 published_histories:
   selectors:
-    histories: '#published-histories-table tbody tr'
-    search_input: '#published-histories input.search-query[data-description="filter text input"]'
-    advanced_search_toggle: '#published-histories [data-description="toggle advanced search"]'
-    advanced_search_name_input: '#published-histories-advanced-filter-name'
-    advanced_search_tag_input: '#published-histories-advanced-filter-tag'
-    advanced_search_submit: '#published-histories-advanced-filter-submit'
-    tag_content: '#published-histories-table tbody tr .tag span'
-    column_header: '#published-histories-table thead tr th:nth-child(${column_number})'
+    histories: '#grid-histories-published tbody tr'
+    advanced_search_name_input: '#histories-advanced-filter-name'
+    advanced_search_tag_area: '#histories-advanced-filter-tag .stateless-tags button'
+    advanced_search_tag_input: '#histories-advanced-filter-tag .stateless-tags input'
+    advanced_search_toggle: '#histories-published-grid [data-description="toggle advanced search"]'
+    advanced_search_submit: '#histories-advanced-filter-submit'
+    search_input: '#histories-published-grid input.search-query[data-description="filter text input"]'
 
 shared_histories:
   selectors:
diff --git a/lib/galaxy/managers/histories.py b/lib/galaxy/managers/histories.py
index 6b1e3d256d9e..e704c3569815 100644
--- a/lib/galaxy/managers/histories.py
+++ b/lib/galaxy/managers/histories.py
@@ -207,6 +207,8 @@ def p_tag_filter(term_text: str, quoted: bool):
                 self.model_class.deleted == (true() if show_deleted else false())
             )
 
+        stmt = stmt.distinct()
+
         if include_total_count:
             total_matches = get_count(trans.sa_session, stmt)
         else:
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index eb3d0a3e8731..b16bd8e9ba71 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -564,9 +564,11 @@ def select_grid_operation(self, item_name, option_label):
 
     def select_grid_cell(self, grid_name, item_name, column_index=3):
         cell = None
-        grid = self.wait_for_selector(grid_name)
+        grid = self.wait_for_selector(f"{grid_name} table")
         for row in grid.find_elements(By.TAG_NAME, "tr"):
             td = row.find_elements(By.TAG_NAME, "td")
+            print(td[0].text)
+            print(td[1].text)
             if item_name in [td[0].text, td[1].text]:
                 cell = td[column_index]
                 break
@@ -1733,10 +1735,10 @@ def histories_click_advanced_search(self):
         self.wait_for_and_click_selector(search_selector)
 
     @retry_during_transitions
-    def histories_get_history_names(self):
+    def histories_get_history_names(self, selector="#histories-grid"):
         self.sleep_for(self.wait_types.UX_RENDER)
         names = []
-        grid = self.wait_for_selector("#histories-grid")
+        grid = self.wait_for_selector(selector)
         for row in grid.find_elements(By.TAG_NAME, "tr"):
             td = row.find_elements(By.TAG_NAME, "td")
             name = td[1].text if td[0].text == "" else td[0].text
diff --git a/lib/galaxy_test/selenium/test_histories_published.py b/lib/galaxy_test/selenium/test_histories_published.py
index aa609a7880e8..0adb3e594400 100644
--- a/lib/galaxy_test/selenium/test_histories_published.py
+++ b/lib/galaxy_test/selenium/test_histories_published.py
@@ -19,8 +19,9 @@ def test_published_histories(self):
     def test_published_histories_sort_by_name(self):
         self._login()
         self.navigate_to_published_histories()
-        self.sleep_for(self.wait_types.UX_RENDER)
-        self.components.published_histories.column_header(column_number=1).wait_for_and_click()
+
+        self.wait_for_and_click_selector('[data-description="grid sort key name"]')
+
         sorted_histories = self.get_published_history_names_from_server(sort_by="name")
         self.assert_histories_present(sorted_histories, sort_by_matters=True)
 
@@ -28,8 +29,9 @@ def test_published_histories_sort_by_name(self):
     def test_published_histories_sort_by_last_update(self):
         self._login()
         self.navigate_to_published_histories()
-        self.sleep_for(self.wait_types.UX_RENDER)
-        self.components.published_histories.column_header(column_number=5).wait_for_and_click()
+
+        self.wait_for_and_click_selector('[data-description="grid sort key update_time"]')
+
         expected_history_names = self.get_published_history_names_from_server(sort_by="update_time")
         self.assert_histories_present(expected_history_names, sort_by_matters=True)
 
@@ -37,17 +39,12 @@ def test_published_histories_sort_by_last_update(self):
     def test_published_histories_tag_click(self):
         self._login()
         self.navigate_to_published_histories()
-        self.sleep_for(self.wait_types.UX_RENDER)
-        present_histories = self.get_present_histories()
-        clicked = False
-        for row in present_histories:
-            his = row.find_elements(By.TAG_NAME, "td")[0]
-            if self.history3_name in his.text:
-                row.find_elements(By.TAG_NAME, "td")[3].find_elements(By.CSS_SELECTOR, ".tag")[0].click()
-                clicked = True
-                break
-
-        assert clicked
+
+        # Search by tag
+        tags_cell = self.select_grid_cell("#histories-published-grid", self.history3_name)
+        tag = tags_cell.find_element(By.CSS_SELECTOR, ".tag")
+        tag.click()
+
         text = self.components.published_histories.search_input.wait_for_value()
         if text == "":
             raise AssertionError("Failed to update search filter on tag click")
@@ -55,33 +52,17 @@ def test_published_histories_tag_click(self):
         self.assert_histories_present([self.history3_name, self.history1_name])
 
     @selenium_test
-    def test_published_histories_username_click(self):
+    def test_published_histories_username_filter(self):
         self._login()
         self.navigate_to_published_histories()
-        self.sleep_for(self.wait_types.UX_RENDER)
-        present_histories = self.get_present_histories()
-        clicked = False
-        for row in present_histories:
-            his = row.find_elements(By.TAG_NAME, "td")[0]
-            if self.history2_name in his.text:
-                row.find_elements(By.TAG_NAME, "td")[2].find_elements(
-                    By.CSS_SELECTOR, ".published-histories-username-link"
-                )[0].click()
-                clicked = True
-                break
-
-        assert clicked
-        text = self.components.published_histories.search_input.wait_for_value()
-        if "test2" not in text:
-            raise AssertionError("Failed to update search filter with username on username click")
-
+        username = self.user2_email.split("@")[0]
+        self.components.published_histories.search_input.wait_for_and_send_keys(f"user:{username}")
         self.assert_histories_present([self.history2_name])
 
     @selenium_test
     def test_published_histories_search_standard(self):
         self._login()
         self.navigate_to_published_histories()
-        self.sleep_for(self.wait_types.UX_RENDER)
         self.components.published_histories.search_input.wait_for_and_send_keys(self.history1_name)
         self.assert_histories_present([self.history1_name])
 
@@ -89,24 +70,28 @@ def test_published_histories_search_standard(self):
     def test_published_histories_search_advanced(self):
         self._login()
         self.navigate_to_published_histories()
-        self.sleep_for(self.wait_types.UX_RENDER)
         self.components.published_histories.advanced_search_toggle.wait_for_and_click()
-        # search by tag and name
-        self.components.published_histories.advanced_search_tag_input.wait_for_and_send_keys(self.history3_tags)
         self.components.published_histories.advanced_search_name_input.wait_for_and_send_keys(self.history3_name)
+
+        self.components.published_histories.advanced_search_tag_area.wait_for_and_click()
+        input_element = self.components.published_histories.advanced_search_tag_input.wait_for_visible()
+        input_element.send_keys(self.history3_tags[0])
+        self.send_enter(input_element)
+        self.send_escape(input_element)
+        self.sleep_for(self.wait_types.UX_RENDER)
+
         self.components.published_histories.advanced_search_submit.wait_for_and_click()
         self.assert_histories_present([self.history3_name])
 
     @retry_assertion_during_transitions
     def assert_histories_present(self, expected_histories, sort_by_matters=False):
-        present_histories = self.get_present_histories()
+        present_histories = self.histories_get_history_names(selector="#histories-published-grid")
         assert len(present_histories) == len(expected_histories)
-        for index, row in enumerate(present_histories):
-            cell = row.find_elements(By.TAG_NAME, "td")[0]
+        for index, history_name in enumerate(present_histories):
             if not sort_by_matters:
-                assert cell.text in expected_histories
+                assert history_name in expected_histories
             else:
-                assert cell.text == expected_histories[index]
+                assert history_name == expected_histories[index]
 
     def get_published_history_names_from_server(self, sort_by=None):
         published_histories = self.dataset_populator._get("histories/published").json()