diff --git a/src/components/search-form/search-filters.js b/src/components/search-form/search-filters.js
index 47c9d7b35..1491bd877 100644
--- a/src/components/search-form/search-filters.js
+++ b/src/components/search-form/search-filters.js
@@ -124,7 +124,10 @@ const SearchFilters = ({
           const hasSelectedOption = ![undefined, defaultValue].includes(activeFilters[name]);
 
           return (
-            <div className={styles.groupContainer}>
+            <div
+              key={name}
+              className={styles.groupContainer}
+            >
               <div className={styles.groupTitle}>
                 <Label
                   id={accordionLabelId}
diff --git a/src/components/search-section/action-menu/action-menu.js b/src/components/search-section/action-menu/action-menu.js
index e62274f4d..319797399 100644
--- a/src/components/search-section/action-menu/action-menu.js
+++ b/src/components/search-section/action-menu/action-menu.js
@@ -40,6 +40,7 @@ const propTypes = {
   filterCount: PropTypes.number.isRequired,
   onFilterChange: PropTypes.func.isRequired,
   onStandaloneFilterChange: PropTypes.func.isRequired,
+  onToggleActions: PropTypes.func.isRequired,
   onToggleFilter: PropTypes.func.isRequired,
   packagesFacetCollection: PropTypes.object,
   params: PropTypes.object,
@@ -70,6 +71,7 @@ const ActionMenu = ({
   filterCount,
   onFilterChange,
   onToggleFilter,
+  onToggleActions,
   onStandaloneFilterChange,
 }) => {
   const intl = useIntl();
@@ -137,7 +139,7 @@ const ActionMenu = ({
     const tagsOptions = getSortedDataOptions();
 
     return (
-      <div role="tablist">
+      <div>
         <IfPermission perm="ui-tags.all">
           <TagsFilter
             isLoading={tagsModelOfAlreadyAddedTags.isLoading}
@@ -167,47 +169,54 @@ const ActionMenu = ({
     );
   };
 
-  const renderActionMenuContent = ({ onToggle, open, keyHandler }) => (
+  const renderActionMenuContent = () => (
     <DropdownMenu>
-      {renderActionMenu({ onToggle, open, keyHandler })}
+      {renderActionMenu()}
     </DropdownMenu>
   );
 
   // // eslint-disable-next-line react/prop-types
-  const renderActionMenuToggle = ({ onToggle, triggerRef, keyHandler, open, ariaProps, getTriggerProps }) => (
-    <div className={styles.actionMenuToggle}>
-      <Button
-        buttonStyle="primary"
-        marginBottom0
-        onClick={onToggle}
-        onKeyDown={keyHandler}
-        ref={triggerRef}
-        {...getTriggerProps()}
-        {...ariaProps}
-      >
-        <Icon icon={open ? 'triangle-up' : 'triangle-down'} iconPosition="end">
-          <FormattedMessage id="stripes-components.paneMenuActionsToggleLabel" />
-        </Icon>
-      </Button>
-      {filterCount > 0 && (
-        <Tooltip
-          text={intl.formatMessage({ id: 'ui-eholdings.actionMenu.filterBadgeTooltip' }, { count: filterCount })}
-          id="filter-badge-tooltip"
+  const renderActionMenuToggle = ({ onToggle, triggerRef, keyHandler, open, ariaProps, getTriggerProps }) => {
+    const handleActionMenuToggle = (e) => {
+      onToggleActions(!open);
+      onToggle(e);
+    };
+
+    return (
+      <div className={styles.actionMenuToggle}>
+        <Button
+          buttonStyle="primary"
+          marginBottom0
+          onKeyDown={keyHandler}
+          ref={triggerRef}
+          {...getTriggerProps()}
+          {...ariaProps}
+          onClick={handleActionMenuToggle}
         >
-          {({ ref, ariaIds }) => (
-            <div
-              ref={ref}
-              aria-labelledby={ariaIds.text}
-            >
-              <Badge>
-                {filterCount}
-              </Badge>
-            </div>
-          )}
-        </Tooltip>
-      )}
-    </div>
-  );
+          <Icon icon={open ? 'triangle-up' : 'triangle-down'} iconPosition="end">
+            <FormattedMessage id="stripes-components.paneMenuActionsToggleLabel" />
+          </Icon>
+        </Button>
+        {filterCount > 0 && (
+          <Tooltip
+            text={intl.formatMessage({ id: 'ui-eholdings.actionMenu.filterBadgeTooltip' }, { count: filterCount })}
+            id="filter-badge-tooltip"
+          >
+            {({ ref, ariaIds }) => (
+              <div
+                ref={ref}
+                aria-labelledby={ariaIds.text}
+              >
+                <Badge>
+                  {filterCount}
+                </Badge>
+              </div>
+            )}
+          </Tooltip>
+        )}
+      </div>
+    );
+  };
 
   return (
     <Dropdown
diff --git a/src/components/search-section/search-section.js b/src/components/search-section/search-section.js
index 3847870d9..9042801e3 100644
--- a/src/components/search-section/search-section.js
+++ b/src/components/search-section/search-section.js
@@ -27,6 +27,7 @@ const EMPTY_OBJECT = {};
 const propTypes = {
   accessTypes: PropTypes.object.isRequired,
   onFilter: PropTypes.func.isRequired,
+  onToggleActions: PropTypes.func.isRequired,
   packagesFacetCollection: PropTypes.object,
   params: PropTypes.object,
   prevDataOfOptedPackage: PropTypes.object,
@@ -48,6 +49,7 @@ const SearchSection = ({
   titlesFacets = EMPTY_OBJECT,
   packagesFacetCollection = EMPTY_OBJECT,
   onFilter,
+  onToggleActions,
 }) => {
   const intl = useIntl();
 
@@ -194,6 +196,7 @@ const SearchSection = ({
       <ActionMenu
         searchType={searchType}
         onStandaloneFilterChange={handleStandaloneFilterChange}
+        onToggleActions={onToggleActions}
         tagsModelOfAlreadyAddedTags={tagsModelOfAlreadyAddedTags}
         searchByTagsEnabled={searchByTagsEnabled}
         searchByAccessTypesEnabled={searchByAccessTypesEnabled}
diff --git a/src/components/tags-filter/tags-filter.js b/src/components/tags-filter/tags-filter.js
index 21fd74e16..7c9278f73 100644
--- a/src/components/tags-filter/tags-filter.js
+++ b/src/components/tags-filter/tags-filter.js
@@ -2,7 +2,6 @@ import { useRef } from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 
-import { Icon } from '@folio/stripes/components';
 import { MultiSelectionFilter } from '@folio/stripes/smart-components';
 
 import { ClearButton } from '../clear-button';
@@ -44,10 +43,6 @@ const TagsFilter = ({
     labelRef.current?.focus();
   };
 
-  if (isLoading) {
-    return <Icon icon="spinner-ellipsis" />;
-  }
-
   return (
     <>
       <div className={styles.headline}>
@@ -81,6 +76,7 @@ const TagsFilter = ({
           selectedValues={selectedValues}
           disabled={!searchByTagsEnabled}
           aria-labelledby="selectTagFilter-label"
+          showLoading={isLoading}
         />
       </div>
     </>
diff --git a/src/routes/package-show-route/package-show-route.js b/src/routes/package-show-route/package-show-route.js
index bca1eaca5..441d4e6dd 100644
--- a/src/routes/package-show-route/package-show-route.js
+++ b/src/routes/package-show-route/package-show-route.js
@@ -397,7 +397,6 @@ class PackageShowRoute extends Component {
 
     const {
       pkgSearchParams,
-      queryId,
       isTitlesUpdating,
     } = this.state;
 
@@ -446,6 +445,7 @@ class PackageShowRoute extends Component {
               accessTypes={accessStatusTypes}
               searchType={listTypes.TITLES}
               onFilter={this.searchTitles}
+              onToggleActions={this.toggleSearchModal}
             />
           }
         />