diff --git a/custom_components/mass/const.py b/custom_components/mass/const.py
index 2477a5d7..265a6e7f 100644
--- a/custom_components/mass/const.py
+++ b/custom_components/mass/const.py
@@ -51,5 +51,6 @@
 KODI_DOMAIN = "kodi"
 GROUP_DOMAIN = "group"
 ALEXA_DOMAIN = "alexa_media"
+VOLUMIO_DOMAIN = "volumio"
 
 BLACKLIST_DOMAINS = (ATV_DOMAIN, ALEXA_DOMAIN)
diff --git a/custom_components/mass/frontend/src/components/GlobalSearch.vue b/custom_components/mass/frontend/src/components/GlobalSearch.vue
new file mode 100644
index 00000000..83cc6aef
--- /dev/null
+++ b/custom_components/mass/frontend/src/components/GlobalSearch.vue
@@ -0,0 +1,279 @@
+<template>
+  <v-card>
+    <v-text-field
+      v-model="search"
+      id="searchInput"
+      clearable
+      :prepend-inner-icon="mdiMagnify"
+      :label="$t('type_to_search')"
+      hide-details
+      variant="filled"
+      style="width: auto; margin: 10px"
+      @focus="searchHasFocus = true"
+      @blur="searchHasFocus = false"
+    ></v-text-field>
+
+    <div v-if="search">
+      <v-chip-group
+        v-model="viewFilter"
+        column
+        style="margin-top: 15px; margin-left: 10px"
+      >
+        <v-chip filter outlined v-for="item in viewFilters" :key="item">
+          {{ $t(item) }}
+        </v-chip>
+      </v-chip-group>
+
+      <MediaItemContextMenu
+        :items="selectedItems"
+        @clear="
+          () => {
+            selectedItems = [];
+          }
+        "
+        v-model="showContextMenu"
+      />
+
+      <div
+        style="
+          margin-left: 15px;
+          margin-right: 15px;
+          margin-top: 20px;
+          margin-bottom: 20px;
+          padding: 0;
+        "
+      >
+        <!-- loading animation -->
+        <v-progress-linear indeterminate v-if="loading"></v-progress-linear>
+
+        <!-- panel view -->
+        <v-row dense align-content="start" align="start" v-if="viewMode == 'panel'">
+          <v-col v-for="item in filteredItems" :key="item.uri" align-self="start">
+            <PanelviewItem
+              :item="item"
+              :size="thumbSize"
+              :is-selected="false"
+              :show-checkboxes="false"
+              @menu="onMenu"
+              @click="onClick"
+            />
+          </v-col>
+        </v-row>
+
+        <!-- list view -->
+        <div v-if="viewMode == 'list'">
+          <RecycleScroller
+            v-slot="{ item }"
+            :items="filteredItems"
+            :item-size="60"
+            key-field="item_id"
+            page-mode
+          >
+            <ListviewItem
+              :item="item"
+              :show-track-number="false"
+              :show-duration="true"
+              :show-library="false"
+              :show-menu="true"
+              :show-providers="true"
+              :show-checkboxes="false"
+              :is-selected="false"
+              :show-details="true"
+              @menu="onMenu"
+              @click="onClick"
+            ></ListviewItem>
+          </RecycleScroller>
+        </div>
+      </div>
+      <v-toolbar dense flat color="transparent" height="45">
+        <span>{{ $t("items_total", [filteredItems.length]) }}</span>
+        <v-spacer></v-spacer>
+
+        <v-tooltip location="bottom">
+          <template #activator="{ props }">
+            <v-btn
+              v-bind="props"
+              @click="toggleViewMode()"
+              :icon="viewMode == 'panel' ? mdiViewList : mdiGrid"
+            ></v-btn>
+          </template>
+          <span>{{ $t("tooltip.toggle_view_mode") }}</span>
+        </v-tooltip>
+      </v-toolbar>
+    </div>
+  </v-card>
+</template>
+
+<script setup lang="ts">
+/* eslint-disable @typescript-eslint/no-unused-vars,vue/no-setup-props-destructure */
+import { mdiMagnify, mdiGrid, mdiViewList } from "@mdi/js";
+
+import {
+  ref,
+  computed,
+  onBeforeUnmount,
+  onMounted,
+  watch,
+  watchEffect,
+} from "vue";
+import { useDisplay } from "vuetify";
+import { MediaType, type MediaItemType } from "../plugins/api";
+import { RecycleScroller } from "vue-virtual-scroller";
+import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
+import { store } from "../plugins/store";
+import ListviewItem from "./ListviewItem.vue";
+import PanelviewItem from "./PanelviewItem.vue";
+import MediaItemContextMenu from "./MediaItemContextMenu.vue";
+import { useRouter } from "vue-router";
+import { useI18n } from "vue-i18n";
+import { api } from "../plugins/api";
+
+// global refs
+const router = useRouter();
+const i18n = useI18n();
+const { mobile } = useDisplay();
+
+// local refs
+const viewMode = ref("list");
+const viewFilter = ref(0);
+const search = ref("");
+const searchHasFocus = ref(false);
+const items = ref<MediaItemType[]>([]);
+const loading = ref(false);
+const showContextMenu = ref(false);
+const selectedItems = ref<MediaItemType[]>([]);
+const throttleId = ref();
+
+const viewFilters = ["topresult", "artists", "albums", "tracks", "playlists"];
+
+// computed properties
+const thumbSize = computed(() => {
+  return mobile.value ? 140 : 150;
+});
+
+// methods
+
+const toggleViewMode = function () {
+  if (viewMode.value === "panel") viewMode.value = "list";
+  else viewMode.value = "panel";
+  localStorage.setItem(
+    `viewMode.search.${viewFilterStr.value}`,
+    viewMode.value
+  );
+};
+
+const onMenu = function (item: MediaItemType) {
+  selectedItems.value = [item];
+  showContextMenu.value = true;
+};
+
+const onClick = function (mediaItem: MediaItemType) {
+  // mediaItem in the list is clicked
+
+  if (
+    ["artist", "album", "playlist"].includes(mediaItem.media_type) ||
+    !store.selectedPlayer?.available
+  ) {
+    router.push({
+      name: mediaItem.media_type,
+      params: {
+        item_id: mediaItem.item_id,
+        provider: mediaItem.provider,
+      },
+    });
+  } else if (store.selectedPlayer) {
+    // assume track (or radio) item
+    api.playMedia(mediaItem);
+  }
+};
+
+// watchers
+watch(
+  () => search.value,
+  (newVal) => {
+    clearTimeout(throttleId.value);
+    throttleId.value = setTimeout(() => {
+      loadSearchResults();
+    }, 200);
+  }
+);
+
+const loadSearchResults = async function () {
+  loading.value = true;
+  localStorage.setItem("globalsearch", search.value);
+
+  if (search.value) {
+    items.value = await api.search(search.value);
+  } else {
+    items.value = [];
+  }
+  loading.value = false;
+};
+
+const viewFilterStr = computed(() => {
+  return viewFilters[viewFilter.value];
+});
+
+const filteredItems = computed(() => {
+  if (viewFilterStr.value == "artists") {
+    return items.value.filter((x) => x.media_type == MediaType.ARTIST);
+  }
+  if (viewFilterStr.value == "albums") {
+    return items.value.filter((x) => x.media_type == MediaType.ALBUM);
+  }
+  if (viewFilterStr.value == "tracks") {
+    return items.value.filter((x) => x.media_type == MediaType.TRACK);
+  }
+  if (viewFilterStr.value == "playlists") {
+    return items.value.filter((x) => x.media_type == MediaType.PLAYLIST);
+  }
+  if (viewFilterStr.value == "radios") {
+    return items.value.filter((x) => x.media_type == MediaType.RADIO);
+  }
+
+  return items.value;
+});
+
+// get/set default settings at load
+watchEffect(() => {
+  // get stored/default viewMode for this itemtype
+  const savedViewMode = localStorage.getItem(
+    `viewMode.search.${viewFilterStr.value}`
+  );
+  if (savedViewMode) {
+    viewMode.value = savedViewMode;
+  } else if (viewFilterStr.value == "artists") {
+    viewMode.value = "panel";
+  } else if (viewFilterStr.value == "albums") {
+    viewMode.value = "panel";
+  } else {
+    viewMode.value = "list";
+  }
+});
+
+onMounted(() => {
+  const savedSearch = localStorage.getItem("globalsearch");
+  if (savedSearch) {
+    search.value = savedSearch;
+  }
+});
+
+// lifecycle hooks
+const keyListener = function (e: KeyboardEvent) {
+  if (showContextMenu.value) return;
+  if (e.key === "a" && (e.ctrlKey || e.metaKey)) {
+    e.preventDefault();
+    selectedItems.value = items.value;
+  } else if (!searchHasFocus.value && e.key == "Backspace") {
+    search.value = search.value.slice(0, -1);
+  } else if (!searchHasFocus.value && e.key.length == 1) {
+    search.value += e.key;
+  }
+};
+
+document.addEventListener("keydown", keyListener);
+
+onBeforeUnmount(() => {
+  document.removeEventListener("keydown", keyListener);
+});
+</script>
diff --git a/custom_components/mass/frontend/src/components/InfoHeader.vue b/custom_components/mass/frontend/src/components/InfoHeader.vue
index 90bdbe23..65d1c5fc 100644
--- a/custom_components/mass/frontend/src/components/InfoHeader.vue
+++ b/custom_components/mass/frontend/src/components/InfoHeader.vue
@@ -124,7 +124,7 @@
                   color="primary"
                   v-bind="props"
                   :prepend-icon="mdiPlayCircle"
-                  :disabled="!activePlayerQueue"
+                  :disabled="!store.selectedPlayer?.available"
                 >
                   {{ $t("play") }}
                 </v-btn>
diff --git a/custom_components/mass/frontend/src/components/ItemsListing.vue b/custom_components/mass/frontend/src/components/ItemsListing.vue
index 21cef397..8d9d316e 100644
--- a/custom_components/mass/frontend/src/components/ItemsListing.vue
+++ b/custom_components/mass/frontend/src/components/ItemsListing.vue
@@ -47,6 +47,19 @@
         <span>{{ $t("tooltip.filter_library") }}</span>
       </v-tooltip>
 
+      <v-tooltip location="bottom" v-if="showAlbumArtistsOnlyFilter">
+        <template #activator="{ props }">
+          <v-btn v-bind="props" icon @click="toggleAlbumArtistsFilter">
+            <v-icon
+              :icon="
+                albumArtistsOnlyFilter ? mdiAccountMusic : mdiAccountMusicOutline
+              "
+            ></v-icon>
+          </v-btn>
+        </template>
+        <span>{{ $t("tooltip.album_artist_filter") }}</span>
+      </v-tooltip>
+
       <v-tooltip location="bottom">
         <template #activator="{ props }">
           <v-btn v-bind="props" icon @click="loadData(true)">
@@ -55,7 +68,9 @@
             </v-badge>
           </v-btn>
         </template>
-        <span v-if="newContentAvailable">{{ $t("tooltip.refresh_new_content") }}</span>
+        <span v-if="newContentAvailable">{{
+          $t("tooltip.refresh_new_content")
+        }}</span>
         <span v-else>{{ $t("tooltip.refresh") }}</span>
       </v-tooltip>
 
@@ -69,7 +84,10 @@
           <v-tooltip location="bottom">
             <template v-slot:activator="{ props: tooltip }">
               <v-btn icon v-bind="props">
-                <v-icon v-bind="mergeProps(menu, tooltip)" :icon="mdiSort"></v-icon>
+                <v-icon
+                  v-bind="mergeProps(menu, tooltip)"
+                  :icon="mdiSort"
+                ></v-icon>
               </v-btn>
             </template>
             <span>{{ $t("tooltip.sort_options") }}</span>
@@ -79,7 +97,9 @@
           <v-list>
             <div v-for="key of sortKeys" :key="key">
               <v-list-item @click="changeSort(key)">
-                <v-list-item-title v-text="$t('sort.' + key)"></v-list-item-title>
+                <v-list-item-title
+                  v-text="$t('sort.' + key)"
+                ></v-list-item-title>
                 <template v-slot:append>
                   <v-icon v-if="sortBy == key" :icon="mdiCheck"></v-icon>
                 </template>
@@ -125,7 +145,12 @@
       :label="$t('search')"
       hide-details
       variant="filled"
-      style="width: auto; margin-left: 15px; margin-right: 15px; margin-top: 10px"
+      style="
+        width: auto;
+        margin-left: 15px;
+        margin-right: 15px;
+        margin-top: 10px;
+      "
       v-if="showSearch"
       @focus="searchHasFocus = true"
       @blur="searchHasFocus = false"
@@ -144,7 +169,12 @@
       <v-progress-linear indeterminate v-if="loading"></v-progress-linear>
 
       <!-- panel view -->
-      <v-row dense align-content="start" align="start" v-if="viewMode == 'panel'">
+      <v-row
+        dense
+        align-content="start"
+        align="start"
+        v-if="viewMode == 'panel'"
+      >
         <v-col v-for="item in items" :key="item.uri" align-self="start">
           <PanelviewItem
             :item="item"
@@ -177,6 +207,7 @@
             :show-checkboxes="showCheckboxes"
             :is-selected="isSelected(item)"
             :show-details="itemtype.includes('versions')"
+            :parent-item="parentItem"
             @select="onSelect"
             @menu="onMenu"
             @click="onClick"
@@ -192,12 +223,26 @@
         <v-alert
           type="info"
           v-if="!loading && items.length == 0 && (search || inLibraryOnly)"
-          >{{ $t("no_content_filter") }}</v-alert
+          >{{ $t("no_content_filter")
+          }}<v-btn
+            v-if="search"
+            style="margin-top: 15px"
+            @click="redirectSearch"
+            >{{ $t("try_global_search") }}</v-btn
+          ></v-alert
         >
         <v-alert type="info" v-else-if="!loading && items.length == 0">{{
           $t("no_content")
         }}</v-alert>
       </div>
+      <v-snackbar :model-value="selectedItems.length > 1">
+        <span>{{ $t("items_selected", [selectedItems.length]) }}</span>
+        <template v-slot:actions>
+          <v-btn color="primary" variant="text" @click="showContextMenu = true">
+            {{ $t("actions") }}
+          </v-btn>
+        </template>
+      </v-snackbar>
     </div>
   </section>
 </template>
@@ -215,7 +260,8 @@ import {
   mdiRefresh,
   mdiCheckboxMultipleOutline,
   mdiCheckboxMultipleBlankOutline,
-  mdiTune,
+  mdiAccountMusic,
+  mdiAccountMusicOutline,
 } from "@mdi/js";
 
 import {
@@ -259,6 +305,7 @@ export interface Props {
   showLibrary?: boolean;
   showDuration?: boolean;
   parentItem?: MediaItemType;
+  showAlbumArtistsOnlyFilter?: boolean;
   loadData: (
     offset: number,
     limit: number,
@@ -299,12 +346,17 @@ const selectedItems = ref<MediaItemType[]>([]);
 const showContextMenu = ref(false);
 const newContentAvailable = ref(false);
 const showCheckboxes = ref(false);
+const albumArtistsOnlyFilter = ref(false);
 
 // computed properties
 const thumbSize = computed(() => {
   return mobile.value ? 140 : 150;
 });
 
+const emit = defineEmits<{
+  (e: "toggleAlbumArtistsOnly", value: boolean): void;
+}>();
+
 // methods
 const toggleSearch = function () {
   if (showSearch.value) showSearch.value = false;
@@ -329,6 +381,17 @@ const toggleLibraryFilter = function () {
   loadData(true);
 };
 
+const toggleAlbumArtistsFilter = function () {
+  albumArtistsOnlyFilter.value = !albumArtistsOnlyFilter.value;
+  const albumArtistsOnlyStr = albumArtistsOnlyFilter.value ? "true" : "false";
+  localStorage.setItem(
+    `albumArtistsFilter.${props.itemtype}`,
+    albumArtistsOnlyStr
+  );
+  emit("toggleAlbumArtistsOnly", albumArtistsOnlyFilter.value);
+  loadData(true);
+};
+
 const isSelected = function (item: MediaItemType) {
   return selectedItems.value.includes(item);
 };
@@ -373,7 +436,8 @@ const onClick = function (mediaItem: MediaItemType) {
 
   if (
     ["artist", "album", "playlist"].includes(mediaItem.media_type) ||
-    force_provider_version == "true"
+    force_provider_version == "true" ||
+    !store.selectedPlayer?.available
   ) {
     router.push({
       name: mediaItem.media_type,
@@ -413,10 +477,16 @@ const loadNextPage = function ($state: any) {
   });
 };
 
+const redirectSearch = function () {
+  localStorage.setItem("globalsearch", search.value);
+  router.push({ name: "home" });
+};
+
 // watchers
 watch(
   () => search.value,
   (newVal) => {
+    if (newVal) showSearch.value = true;
     loadData(true);
   }
 );
@@ -442,6 +512,9 @@ const loadData = async function (clear = false, limit = defaultLimit) {
   }
   totalItems.value = nextItems.total;
   loading.value = false;
+  let storKey = `search.${props.itemtype}`;
+  if (props.parentItem) storKey += props.parentItem.item_id;
+  localStorage.setItem(storKey, search.value);
 };
 
 // get/set default settings at load
@@ -474,6 +547,24 @@ onMounted(() => {
       inLibraryOnly.value = true;
     }
   }
+
+  // get stored/default albumArtistsOnlyFilter for this itemtype
+  if (props.showAlbumArtistsOnlyFilter !== false) {
+    const albumArtistsOnlyStr = localStorage.getItem(
+      `albumArtistsFilter.${props.itemtype}`
+    );
+    if (albumArtistsOnlyStr && albumArtistsOnlyStr == "true") {
+      albumArtistsOnlyFilter.value = true;
+      emit("toggleAlbumArtistsOnly", albumArtistsOnlyFilter.value);
+    }
+  }
+  // get stored searchquery
+  let storKey = `search.${props.itemtype}`;
+  if (props.parentItem) storKey += props.parentItem.item_id;
+  const savedSearch = localStorage.getItem(storKey);
+  if (savedSearch) {
+    search.value = savedSearch;
+  }
   loadData(true);
 });
 
@@ -486,25 +577,11 @@ onMounted(() => {
       MassEventType.MEDIA_ITEM_DELETED,
     ],
     (evt: MassEvent) => {
-      if (props.parentItem) {
-        // update details listing if parent updates
-        const updatedItem = evt.data as MediaItemType;
-        if (props.parentItem?.uri == updatedItem.uri) {
-          loadData(true);
-        } else {
-          for (const provId of updatedItem.provider_ids) {
-            if (
-              provId.prov_type == props.parentItem?.provider &&
-              provId.item_id == props.parentItem?.item_id
-            ) {
-              loadData(true);
-              break;
-            }
-          }
+      if (evt.event == MassEventType.MEDIA_ITEM_ADDED) {
+        if (props.itemtype.includes((evt.data as MediaItemType).media_type)) {
+          // signal that there is new content
+          newContentAvailable.value = true;
         }
-      } else if (evt.event == MassEventType.MEDIA_ITEM_ADDED) {
-        // signal that there is new content
-        newContentAvailable.value = true;
       } else if (evt.event == MassEventType.MEDIA_ITEM_DELETED) {
         items.value = items.value.filter((x) => x.uri != evt.object_id);
       } else if (evt.event == MassEventType.MEDIA_ITEM_UPDATED) {
@@ -566,7 +643,10 @@ export const filteredItems = function (
         item.artist?.name.toLowerCase().includes(searchStr)
       ) {
         result.push(item);
-      } else if ("album" in item && item.album?.name.toLowerCase().includes(searchStr)) {
+      } else if (
+        "album" in item &&
+        item.album?.name.toLowerCase().includes(searchStr)
+      ) {
         result.push(item);
       } else if (
         "artists" in item &&
@@ -581,7 +661,9 @@ export const filteredItems = function (
   }
   // sort
   if (sortBy == "sort_name") {
-    result.sort((a, b) => (a.sort_name || a.name).localeCompare(b.sort_name || b.name));
+    result.sort((a, b) =>
+      (a.sort_name || a.name).localeCompare(b.sort_name || b.name)
+    );
   }
   if (sortBy == "sort_album") {
     result.sort((a, b) =>
@@ -595,14 +677,18 @@ export const filteredItems = function (
   }
   if (sortBy == "track_number") {
     result.sort(
-      (a, b) => ((a as Track).track_number || 0) - ((b as Track).track_number || 0)
+      (a, b) =>
+        ((a as Track).track_number || 0) - ((b as Track).track_number || 0)
     );
     result.sort(
-      (a, b) => ((a as Track).disc_number || 0) - ((b as Track).disc_number || 0)
+      (a, b) =>
+        ((a as Track).disc_number || 0) - ((b as Track).disc_number || 0)
     );
   }
   if (sortBy == "position") {
-    result.sort((a, b) => ((a as Track).position || 0) - ((b as Track).position || 0));
+    result.sort(
+      (a, b) => ((a as Track).position || 0) - ((b as Track).position || 0)
+    );
   }
   if (sortBy == "year") {
     result.sort((a, b) => ((a as Album).year || 0) - ((b as Album).year || 0));
@@ -612,7 +698,9 @@ export const filteredItems = function (
   }
 
   if (sortBy == "duration") {
-    result.sort((a, b) => ((a as Track).duration || 0) - ((b as Track).duration || 0));
+    result.sort(
+      (a, b) => ((a as Track).duration || 0) - ((b as Track).duration || 0)
+    );
   }
 
   if (sortBy == "provider") {
diff --git a/custom_components/mass/frontend/src/components/ListviewItem.vue b/custom_components/mass/frontend/src/components/ListviewItem.vue
index 3c683c32..484bca3e 100644
--- a/custom_components/mass/frontend/src/components/ListviewItem.vue
+++ b/custom_components/mass/frontend/src/components/ListviewItem.vue
@@ -20,21 +20,13 @@
             "
           />
         </div>
-        <div
-          v-else-if="item.media_type == MediaType.FOLDER"
-          class="listitem-thumb"
-        >
+        <div v-else-if="item.media_type == MediaType.FOLDER" class="listitem-thumb">
           <v-btn variant="plain" icon
             ><v-icon :icon="mdiFolder" size="60" style="align: center"> </v-icon
           ></v-btn>
         </div>
         <div v-else class="listitem-thumb">
-          <MediaItemThumb
-            :item="item"
-            :size="50"
-            width="50px"
-            height="50px"
-          /></div
+          <MediaItemThumb :item="item" :size="50" width="50px" height="50px" /></div
       ></template>
 
       <!-- title -->
@@ -44,9 +36,7 @@
         </span>
         <span v-else>
           {{ item.name }}
-          <span v-if="'version' in item && item.version"
-            >({{ item.version }})</span
-          >
+          <span v-if="'version' in item && item.version">({{ item.version }})</span>
         </span>
         <!-- explicit icon -->
         <v-tooltip location="bottom">
@@ -66,30 +56,20 @@
       <!-- subtitle -->
       <template v-slot:subtitle>
         <!-- track: artists(s) + album -->
-        <div
-          v-if="
-            item.media_type == MediaType.TRACK && item.album && !showTrackNumber
-          "
-        >
+        <div v-if="item.media_type == MediaType.TRACK && item.album && !showTrackNumber">
           {{ getArtistsString(item.artists) }} • {{ item.album.name }}
         </div>
         <!-- albumtrack: artists(s) + disc/track number -->
         <div
           v-else-if="
-            item.media_type == MediaType.TRACK &&
-            item.track_number &&
-            showTrackNumber
+            item.media_type == MediaType.TRACK && item.track_number && showTrackNumber
           "
         >
-          {{ getArtistsString(item.artists) }} • disc
-          {{ item.disc_number }} track {{ item.track_number }}
+          {{ getArtistsString(item.artists) }} • disc {{ item.disc_number }} track
+          {{ item.track_number }}
         </div>
         <!-- album: albumtype + artists + year -->
-        <div
-          v-else-if="
-            item.media_type == MediaType.ALBUM && item.artists && item.year
-          "
-        >
+        <div v-else-if="item.media_type == MediaType.ALBUM && item.artists && item.year">
           {{ $t("album_type." + item.album_type) }} •
           {{ getArtistsString(item.artists) }} • {{ item.year }}
         </div>
@@ -100,14 +80,12 @@
         </div>
         <!-- track/album falback: artist present -->
         <div v-else-if="'artists' in item && item.artists">
-         {{ getArtistsString(item.artists) }}
+          {{ getArtistsString(item.artists) }}
         </div>
         <!-- playlist owner -->
         <div v-else-if="'owner' in item && item.owner">{{ item.owner }}</div>
         <!-- radio description -->
-        <div
-          v-if="item.media_type == MediaType.RADIO && item.metadata.description"
-        >
+        <div v-if="item.media_type == MediaType.RADIO && item.metadata.description">
           {{ item.metadata.description }}
         </div>
       </template>
@@ -134,9 +112,7 @@
 
           <!-- provider icons -->
           <ProviderIcons
-            v-if="
-              item.provider_ids && showProviders && !$vuetify.display.mobile
-            "
+            v-if="item.provider_ids && showProviders && !$vuetify.display.mobile"
             :provider-ids="item.provider_ids"
             :height="20"
             class="listitem-actions"
@@ -145,9 +121,7 @@
           <!-- in library (heart) icon -->
           <div
             class="listitem-action"
-            v-if="
-              'in_library' in item && showLibrary && !$vuetify.display.mobile
-            "
+            v-if="'in_library' in item && showLibrary && !$vuetify.display.mobile"
           >
             <v-tooltip location="bottom">
               <template #activator="{ props }">
@@ -166,12 +140,27 @@
             </v-tooltip>
           </div>
 
+          <!-- islinked icon -->
+          <v-tooltip location="bottom">
+            <template #activator="{ props }">
+              <v-icon
+                v-bind="props"
+                class="listitem-action"
+                :icon="mdiLinkVariant"
+                size="30"
+                v-if="
+                  parentItem &&
+                  parentItem.provider_ids.find((x) => x.item_id === item.item_id)
+                "
+              />
+            </template>
+            <span>{{ $t("tooltip.linked") }}</span>
+          </v-tooltip>
+
           <!-- track duration -->
           <div
             class="listitem-action"
-            v-if="
-              showDuration && 'duration' in item && !$vuetify.display.mobile
-            "
+            v-if="showDuration && 'duration' in item && !$vuetify.display.mobile"
           >
             <span>{{ formatDuration(item.duration) }}</span>
           </div>
@@ -194,9 +183,7 @@
               }}</span>
               <v-divider></v-divider>
               <!-- provider icon + name -->
-              <v-list-item
-                style="height: 50px; display: flex; align-items: center"
-              >
+              <v-list-item style="height: 50px; display: flex; align-items: center">
                 <img
                   height="30"
                   width="50"
@@ -204,18 +191,11 @@
                   :src="getProviderIcon(item.provider)"
                   style="object-fit: contain; margin-left: -15px"
                 />
-                {{
-                  truncateString(
-                    api.providers[item.provider_ids[0].prov_id].name,
-                    25
-                  )
-                }}
+                {{ truncateString(api.providers[item.provider_ids[0].prov_id].name, 25) }}
               </v-list-item>
 
               <!-- item ID -->
-              <v-list-item
-                style="height: 50px; display: flex; align-items: center"
-              >
+              <v-list-item style="height: 50px; display: flex; align-items: center">
                 <v-icon
                   size="40"
                   :icon="mdiIdentifier"
@@ -227,9 +207,7 @@
               <!-- link to web location of item (provider share link -->
               <v-list-item
                 style="height: 50px; display: flex; align-items: center"
-                v-if="
-                  item.provider_ids[0].url && !item.provider.includes('file')
-                "
+                v-if="item.provider_ids[0].url && !item.provider.includes('file')"
               >
                 <v-icon
                   size="40"
@@ -310,8 +288,8 @@ import {
   mdiFolder,
   mdiInformationOutline,
   mdiHeadphones,
-  mdiWeb,
   mdiIdentifier,
+  mdiLinkVariant,
 } from "@mdi/js";
 import { ref, computed, reactive } from "vue";
 import { useRouter } from "vue-router";
@@ -354,6 +332,7 @@ export interface Props {
   isSelected: boolean;
   showCheckboxes?: boolean;
   showDetails?: boolean;
+  parentItem?: MediaItemType;
 }
 
 // global refs
@@ -412,10 +391,7 @@ const itemIsAvailable = function (item: MediaItem) {
   return false;
 };
 
-const fetchPreviewUrl = async function (
-  provider: ProviderType,
-  item_id: string
-) {
+const fetchPreviewUrl = async function (provider: ProviderType, item_id: string) {
   const key = `${provider}.${item_id}`;
   if (key in previewUrls) return;
   const url = await api.getTrackPreviewUrl(provider, item_id);
diff --git a/custom_components/mass/frontend/src/components/MediaItemContextMenu.vue b/custom_components/mass/frontend/src/components/MediaItemContextMenu.vue
index 44d80634..e76ba417 100644
--- a/custom_components/mass/frontend/src/components/MediaItemContextMenu.vue
+++ b/custom_components/mass/frontend/src/components/MediaItemContextMenu.vue
@@ -206,7 +206,12 @@ const showContextMenu = async function () {
   if (props.items.length === 1) header.value = props.items[0].name;
   else header.value = t("items_selected", [props.items.length]).toString();
 
-  playMenuItems.value = getPlayMenuItems(props.items);
+  if (store.selectedPlayer && store.selectedPlayer.available) {
+    playMenuItems.value = getPlayMenuItems(props.items);
+  } else {
+    playMenuItems.value = [];
+  }
+  
   // grab the full (lazy) fullItem so we have details about in-library etc.
   let firstItem: MediaItem = props.items[0];
   if (firstItem.provider !== ProviderType.DATABASE) {
@@ -249,12 +254,15 @@ const newPlaylist = async function (provId: string) {
 };
 
 const itemClicked = async function (item: ContextMenuItem) {
-  console.log("itemClicked", item);
   if (item.actionStr == "add_playlist") {
     showPlaylistsMenu.value = true;
   } else if (item.actionStr == "clear") {
     emit("clear");
     close();
+  } else if (item.action && item.actionStr == "play") {
+    item.action();
+    emit("clear");
+    close();
   } else if (item.action) {
     close();
     item.action();
@@ -297,10 +305,10 @@ export const getPlayMenuItems = function (items: MediaItem[]) {
     label: "play_now",
     action: () => {
       api.playMedia(items, QueueOption.PLAY);
-      close();
     },
     icon: mdiPlayCircleOutline,
     labelArgs: [],
+    actionStr: "play"
   });
 
   // Play NEXT
@@ -309,10 +317,10 @@ export const getPlayMenuItems = function (items: MediaItem[]) {
       label: "play_next",
       action: () => {
         api.playMedia(items, QueueOption.NEXT);
-        close();
       },
       icon: mdiSkipNextCircleOutline,
       labelArgs: [],
+      actionStr: "play"
     });
   }
   // Add to Queue
@@ -320,10 +328,10 @@ export const getPlayMenuItems = function (items: MediaItem[]) {
     label: "add_queue",
     action: () => {
       api.playMedia(items, QueueOption.ADD);
-      close();
     },
     icon: mdiPlaylistPlus,
     labelArgs: [],
+    actionStr: "play"
   });
   return playMenuItems;
 };
diff --git a/custom_components/mass/frontend/src/components/PanelviewItem.vue b/custom_components/mass/frontend/src/components/PanelviewItem.vue
index 224435db..40052da3 100644
--- a/custom_components/mass/frontend/src/components/PanelviewItem.vue
+++ b/custom_components/mass/frontend/src/components/PanelviewItem.vue
@@ -66,18 +66,6 @@
     <v-card-text style="padding: 8px; color: primary; margin-top: 8px"
       ><b>{{ truncateString(item.name, 35) }}</b></v-card-text
     >
-    <v-card-subtitle
-      v-if="'artist' in item && item.artist"
-      style="
-        padding: 8px;
-        position: absolute;
-        bottom: 0px;
-        display: flex;
-        align-items: flex-end;
-      "
-      @click.stop="artistClick(item.artist)"
-      v-text="item.artist.name"
-    />
     <v-card-subtitle
       v-if="'artists' in item && item.artists"
       style="
@@ -87,11 +75,10 @@
         display: flex;
         align-items: flex-end;
       "
-      @click.stop="artistClick(item.artists[0])"
-      v-text="item.artists[0].name"
+      v-text="getArtistsString(item.artists)"
     />
     <v-card-subtitle
-      v-if="'owner' in item && item.owner"
+      v-else-if="'owner' in item && item.owner"
       style="
         padding: 8px;
         position: absolute;
@@ -119,7 +106,7 @@ import type {
   MediaItemType,
 } from "../plugins/api";
 import { MediaType, MediaQuality } from "../plugins/api";
-import { truncateString } from "../utils";
+import { truncateString, getArtistsString } from "../utils";
 
 // properties
 export interface Props {
diff --git a/custom_components/mass/frontend/src/plugins/api.ts b/custom_components/mass/frontend/src/plugins/api.ts
index bc738c79..3b4c1149 100644
--- a/custom_components/mass/frontend/src/plugins/api.ts
+++ b/custom_components/mass/frontend/src/plugins/api.ts
@@ -5,7 +5,7 @@ import {
   type Connection,
   createConnection,
   ERR_HASS_HOST_REQUIRED,
-  getAuth,
+  getAuth
 } from "home-assistant-js-websocket";
 import { reactive, ref } from "vue";
 
@@ -16,7 +16,7 @@ export enum MediaType {
   PLAYLIST = "playlist",
   RADIO = "radio",
   FOLDER = "folder",
-  UNKNOWN = "unknown",
+  UNKNOWN = "unknown"
 }
 
 export enum MediaQuality {
@@ -29,7 +29,7 @@ export enum MediaQuality {
   LOSSLESS_HI_RES_1 = 20, // 44.1/48khz 24 bits HI-RES
   LOSSLESS_HI_RES_2 = 21, // 88.2/96khz 24 bits HI-RES
   LOSSLESS_HI_RES_3 = 22, // 176/192khz 24 bits HI-RES
-  LOSSLESS_HI_RES_4 = 23, // above 192khz 24 bits HI-RES
+  LOSSLESS_HI_RES_4 = 23 // above 192khz 24 bits HI-RES
 }
 
 export enum ProviderType {
@@ -42,7 +42,7 @@ export enum ProviderType {
   TUNEIN = "tunein",
   YTMUSIC = "ytmusic",
   DATABASE = "database",
-  URL = "url",
+  URL = "url"
 }
 export interface MediaItemProviderId {
   item_id: string;
@@ -65,7 +65,7 @@ export enum LinkType {
   TIKTOK = "tiktok",
   DISCOGS = "discogs",
   WIKIPEDIA = "wikipedia",
-  ALLMUSIC = "allmusic",
+  ALLMUSIC = "allmusic"
 }
 
 export enum ImageType {
@@ -79,7 +79,7 @@ export enum ImageType {
   BACK = "back",
   CDART = "cdart",
   EMBEDDED_THUMB = "embedded_thumb",
-  OTHER = "other",
+  OTHER = "other"
 }
 
 export interface MediaItemLink {
@@ -141,7 +141,7 @@ export enum AlbumType {
   ALBUM = "album",
   SINGLE = "single",
   COMPILATION = "compilation",
-  UNKNOWN = "unknown",
+  UNKNOWN = "unknown"
 }
 
 export interface Album extends MediaItem {
@@ -209,7 +209,7 @@ export enum ContentType {
   PCM_S32LE = "s32le", // PCM signed 32-bit little-endian
   PCM_F32LE = "f32le", // PCM 32-bit floating-point little-endian
   PCM_F64LE = "f64le", // PCM 64-bit floating-point little-endian
-  UNKNOWN = "?",
+  UNKNOWN = "?"
 }
 
 export interface StreamDetails {
@@ -234,7 +234,7 @@ export enum PlayerState {
   IDLE = "idle",
   PAUSED = "paused",
   PLAYING = "playing",
-  OFF = "off",
+  OFF = "off"
 }
 
 export interface DeviceInfo {
@@ -278,19 +278,19 @@ export enum CrossFadeMode {
   DISABLED = "disabled", // no crossfading at all
   STRICT = "strict", // do not crossfade tracks of same album
   SMART = "smart", // crossfade if possible (do not crossfade different sample rates)
-  ALWAYS = "always", // all tracks - resample to fixed sample rate
+  ALWAYS = "always" // all tracks - resample to fixed sample rate
 }
 
 export enum RepeatMode {
   OFF = "off", // no repeat at all
   ONE = "one", // repeat current/single track
-  ALL = "all", // repeat entire queue
+  ALL = "all" // repeat entire queue
 }
 
 export enum MetadataMode {
   DISABLED = "disabled", // do not notify icy support
   DEFAULT = "default", // enable icy if player requests it, default chunksize
-  LEGACY = "legacy", // enable icy but with legacy 8kb chunksize, requires mp3
+  LEGACY = "legacy" // enable icy but with legacy 8kb chunksize, requires mp3
 }
 
 export interface QueueSettings {
@@ -346,7 +346,7 @@ export enum QueueCommand {
   MOVE_NEXT = "move_next",
   DELETE = "delete",
   GROUP_POWER = "group_power",
-  GROUP_VOLUME = "group_volume",
+  GROUP_VOLUME = "group_volume"
 }
 
 export enum MassEventType {
@@ -365,14 +365,14 @@ export enum MassEventType {
   MEDIA_ITEM_UPDATED = "media_item_updated",
   MEDIA_ITEM_DELETED = "media_item_deleted",
   // special types for local subscriptions only
-  ALL = "*",
+  ALL = "*"
 }
 
 export enum QueueOption {
   PLAY = "play",
   REPLACE = "replace",
   NEXT = "next",
-  ADD = "add",
+  ADD = "add"
 }
 
 export type MassEvent = {
@@ -386,7 +386,7 @@ export enum JobStatus {
   RUNNING = "running",
   CANCELLED = "cancelled",
   FINISHED = "success",
-  ERROR = "error",
+  ERROR = "error"
 }
 
 export type BackgroundJob = {
@@ -418,7 +418,7 @@ export enum MusicProviderFeature {
   LIBRARY_RADIOS_EDIT = "library_radios_edit",
   // playlist-specific features
   PLAYLIST_TRACKS_EDIT = "playlist_tracks_edit",
-  PLAYLIST_CREATE = "playlist_create",
+  PLAYLIST_CREATE = "playlist_create"
 }
 
 export interface MusicProvider {
@@ -487,7 +487,7 @@ export class MusicAssistantApi {
         this.handleMassEvent(msg);
       },
       {
-        type: "mass/subscribe",
+        type: "mass/subscribe"
       }
     );
   }
@@ -537,7 +537,6 @@ export class MusicAssistantApi {
       [provider_id: string]: MusicProvider;
     }>("providers");
     Object.assign(this.providers, providers);
-    console.log("providers", providers);
 
     this.jobs.value = await this.getData("jobs");
   }
@@ -564,7 +563,7 @@ export class MusicAssistantApi {
       item_id,
       lazy,
       refresh,
-      force_provider_version,
+      force_provider_version
     });
   }
 
@@ -581,7 +580,7 @@ export class MusicAssistantApi {
   ): Promise<string> {
     return this.getData("track/preview", {
       provider,
-      item_id,
+      item_id
     });
   }
 
@@ -590,9 +589,17 @@ export class MusicAssistantApi {
     limit?: number,
     sort?: string,
     library?: boolean,
-    search?: string
+    search?: string,
+    albumArtistsOnly?: boolean
   ): Promise<PagedItems> {
-    return this.getData("artists", { offset, sort, limit, library, search });
+    return this.getData("artists", {
+      offset,
+      sort,
+      limit,
+      library,
+      search,
+      album_artists_only: albumArtistsOnly
+    });
   }
 
   public getArtist(
@@ -640,7 +647,7 @@ export class MusicAssistantApi {
       item_id,
       lazy,
       refresh,
-      force_provider_version,
+      force_provider_version
     });
   }
 
@@ -757,8 +764,12 @@ export class MusicAssistantApi {
     return this.getData("browse", { path });
   }
 
-  public search(query: string): Promise<Track[]> {
-    return this.getData("search", { query });
+  public search(
+    query: string,
+    media_types?: MediaType[],
+    limit?: number
+  ): Promise<Track[]> {
+    return this.getData("search", { query, media_types, limit });
   }
 
   public async getPlayers(): Promise<Player[]> {
@@ -858,7 +869,7 @@ export class MusicAssistantApi {
       this.executeCmd("playerqueue/command", {
         queue_id,
         command,
-        command_arg,
+        command_arg
       });
     }, 200);
   }
@@ -904,7 +915,7 @@ export class MusicAssistantApi {
           },
           saveTokens: (tokens) => {
             localStorage.hassTokens = JSON.stringify(tokens);
-          },
+          }
         }
       : {};
     try {
@@ -979,7 +990,7 @@ export class MusicAssistantApi {
     return (this._conn as Connection).sendMessagePromise({
       id: this._lastId,
       type: `mass/${endpoint}`,
-      ...args,
+      ...args
     });
   }
 
@@ -989,7 +1000,7 @@ export class MusicAssistantApi {
     (this._conn as Connection).sendMessage({
       id: this._lastId,
       type: `mass/${endpoint}`,
-      ...args,
+      ...args
     });
   }
 }
diff --git a/custom_components/mass/frontend/src/plugins/i18n.ts b/custom_components/mass/frontend/src/plugins/i18n.ts
index 0dd52d45..53869d36 100644
--- a/custom_components/mass/frontend/src/plugins/i18n.ts
+++ b/custom_components/mass/frontend/src/plugins/i18n.ts
@@ -2,11 +2,15 @@
 import { createI18n } from "vue-i18n";
 
 // supported languages need to be setup here manually
+import de from "../../../translations/frontend/de.json";
 import en from "../../../translations/frontend/en.json";
 import nl from "../../../translations/frontend/nl.json";
+import pl from "../../../translations/frontend/pl.json";
 const messages = {
+  de,
   en,
   nl,
+  pl
 };
 
 export const i18n = createI18n({
diff --git a/custom_components/mass/frontend/src/utils.ts b/custom_components/mass/frontend/src/utils.ts
index ce35b81b..25a536b9 100644
--- a/custom_components/mass/frontend/src/utils.ts
+++ b/custom_components/mass/frontend/src/utils.ts
@@ -3,6 +3,7 @@ import type { Artist, BrowseFolder } from "./plugins/api";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 export const parseBool = (val: string | boolean) => {
   if (val == undefined) return false;
+  if (!val) return false;
   if (typeof val === "boolean") return val;
   return !!JSON.parse(String(val).toLowerCase());
 };
@@ -79,6 +80,7 @@ export const kebabize = (str: string) => {
 
 
 export const getArtistsString = function (artists: Artist[]) {
+  if (!artists) return '';
   return artists
     .map((x) => {
       return x.name;
diff --git a/custom_components/mass/frontend/src/views/AlbumDetails.vue b/custom_components/mass/frontend/src/views/AlbumDetails.vue
index 7ec124b9..801144d6 100644
--- a/custom_components/mass/frontend/src/views/AlbumDetails.vue
+++ b/custom_components/mass/frontend/src/views/AlbumDetails.vue
@@ -62,7 +62,6 @@ const activeTab = ref("");
 const itemDetails = ref<Album>();
 
 const loadItemDetails = async function () {
-  console.log(props);
   itemDetails.value = await api.getAlbum(
     props.provider as ProviderType,
     props.item_id,
diff --git a/custom_components/mass/frontend/src/views/BrowseView.vue b/custom_components/mass/frontend/src/views/BrowseView.vue
index 61d681eb..83b835f5 100644
--- a/custom_components/mass/frontend/src/views/BrowseView.vue
+++ b/custom_components/mass/frontend/src/views/BrowseView.vue
@@ -63,9 +63,10 @@ const loading = ref(false);
 const loadData = async function () {
   loading.value = true;
   browseItem.value = await api.browse(props.path);
+  console.log(browseItem.value)
 
   // set header title to browse title
-  if (!browseItem.value) store.topBarTitle = t("browse");
+  if (!browseItem.value || !props.path) store.topBarTitle = t("browse");
   else {
     if (mobile.value) store.topBarTitle = getBrowseFolderName(browseItem.value, t);
     else
diff --git a/custom_components/mass/frontend/src/views/HomeView.vue b/custom_components/mass/frontend/src/views/HomeView.vue
index 115d86f1..d4e2992e 100644
--- a/custom_components/mass/frontend/src/views/HomeView.vue
+++ b/custom_components/mass/frontend/src/views/HomeView.vue
@@ -1,86 +1,68 @@
 <template>
-  <div
-    style="
-      padding-left: 15px;
-      padding-right: 15px;
-      padding-top: 20px;
-      padding-bottom: 20px;
-    "
-  >
-    <!-- <v-text-field
-      v-model="search"
-      id="searchInput"
-      clearable
-      :prepend-inner-icon="mdiMagnify"
-      label="Global search..."
-      hide-details
-      variant="outlined"
-      @focus="searchHasFocus = true"
-      @blur="searchHasFocus = false"
-    ></v-text-field> -->
-
-    <v-progress-linear indeterminate v-if="loading"></v-progress-linear>
-    <!-- panel view -->
-    <!-- <v-row dense align-content="start" align="start">
-      <v-col v-for="item in browseItems" :key="item.uri" align-self="start">
-        <PanelviewItem :item="item" :size="thumbSize" :is-selected="false" />
-      </v-col>
-    </v-row> -->
-
-    <div style="margin-top: 20px">
-      <v-row dense align-content="start" align="start">
-        <v-col v-for="card in cards" :key="card.label" align-self="start">
-          <v-card
-            @click="$router.push(card.path)"
-            hover
-            border
-            width="auto"
-            min-height="90"
-            min-width="90"
-            align="center"
-            justify="center"
-          >
-            <v-btn variant="plain" icon height="80">
-              <v-icon :icon="card.icon" size="80" style="align: center; padding: 10px">
-              </v-icon>
-            </v-btn>
-            <v-divider />
-            <span class="text-center text-subtitle-1" style="padding: 10px">
-              {{ $t(card.label) }}
-            </span>
-          </v-card>
-        </v-col>
-      </v-row>
-
-      <!-- <v-slide-group class="pa-4" :show-arrows="false">
-      <v-slide-group-item v-for="card in cards" :key="card.key">
-        <v-card
-          @click="$router.push(card.path)"
-          hover
-          border
-          min-width="120"
-          align="center"
-          justify="center"
-          :disabled="api.stats.count[card.key] == 0"
-          :style="api.stats.count[card.key] == 0 ? 'opacity:0.5' : ''"
+  <div>
+    <div
+      style="
+        margin-left: 10px;
+        margin-right: 10px;
+        margin-top: 20px;
+        margin-bottom: 20px;
+      "
+    >
+    <GlobalSearch />
+      <!-- search artists -->
+      <!-- <v-card
+        v-if="searchArtists.length > 0"
+        style="margin-top: 20px; margin-bottom: 20px"
+      >
+        <v-card-title style="margin-left: 15px">{{
+          $t("artists")
+        }}</v-card-title>
+        <v-slide-group
+          show-arrows="always"
+          style="margin-left: 5px; margin-right: 5px; margin-bottom: 10px"
         >
-          <v-icon
-            variant="plain"
-            :icon="card.icon"
-            size="70"
-            style="align: center; padding: 10px"
-          >
-          </v-icon>
-          <v-divider />
-          <span class="text-center text-subtitle-1" style="padding: 10px">
-            {{ $t(card.key) }}
-            <span class="text-caption" v-if="api.stats.count[card.key] > 0"
-              >({{ api.stats.count[card.key] }})</span
+          <v-slide-group-item v-for="item in searchArtists" :key="item.uri">
+            <PanelviewItem
+              :item="item"
+              :size="thumbSize"
+              :is-selected="false"
+              :show-checkboxes="false"
+              style="margin: 5px"
+            />
+          </v-slide-group-item>
+        </v-slide-group>
+      </v-card> -->
+
+      <!-- regular menu items -->
+      <div style="margin-top: 20px">
+        <v-row dense align-content="start" align="start">
+          <v-col v-for="card in cards" :key="card.label" align-self="start">
+            <v-card
+              @click="$router.push(card.path)"
+              hover
+              border
+              width="auto"
+              min-height="90"
+              min-width="90"
+              align="center"
+              justify="center"
             >
-          </span>
-        </v-card>
-      </v-slide-group-item>
-    </v-slide-group> -->
+              <v-btn variant="plain" icon height="80">
+                <v-icon
+                  :icon="card.icon"
+                  size="80"
+                  style="align: center; padding: 10px"
+                >
+                </v-icon>
+              </v-btn>
+              <v-divider />
+              <span class="text-center text-subtitle-1" style="padding: 10px">
+                {{ $t(card.label) }}
+              </span>
+            </v-card>
+          </v-col>
+        </v-row>
+      </div>
     </div>
   </div>
 </template>
@@ -95,21 +77,19 @@ import {
   mdiRadio,
   mdiFolder,
   mdiFileSync,
-  mdiCached
+  mdiCached,
 } from "@mdi/js";
-import { ref, computed, onBeforeUnmount } from "vue";
+import { ref, computed, onBeforeUnmount, watch } from "vue";
 import { store } from "../plugins/store";
 import PanelviewItem from "../components/PanelviewItem.vue";
+import GlobalSearch from "../components/GlobalSearch.vue";
 
-import { api } from "@/plugins/api";
+import { api, type MediaItemType } from "@/plugins/api";
 import { useDisplay } from "vuetify";
 import { useI18n } from "vue-i18n";
 
 const { mobile } = useDisplay();
 const searchHasFocus = ref(false);
-const loading = ref(false);
-const search = ref("");
-const { t } = useI18n();
 
 store.topBarTitle = store.defaultTopBarTitle;
 store.topBarContextMenuItems = [
@@ -119,7 +99,7 @@ store.topBarContextMenuItems = [
     action: () => {
       api.startSync(undefined, undefined);
     },
-    icon: mdiFileSync
+    icon: mdiFileSync,
   },
   {
     label: "sync_full",
@@ -127,7 +107,7 @@ store.topBarContextMenuItems = [
     action: () => {
       api.startSync(undefined, undefined, true);
     },
-    icon: mdiCached
+    icon: mdiCached,
   },
 ];
 onBeforeUnmount(() => {
@@ -135,7 +115,7 @@ onBeforeUnmount(() => {
 });
 
 const thumbSize = computed(() => {
-  return mobile.value ? 150 : 225;
+  return mobile.value ? 100 : 150;
 });
 
 const cards = ref([
@@ -170,4 +150,25 @@ const cards = ref([
     path: "/browse",
   },
 ]);
+
+
 </script>
+
+<style>
+div.v-slide-group__next {
+  position: absolute;
+  right: -5px;
+  min-width: 40px;
+  height: 30px;
+  align-items: start;
+  margin-top: -35px;
+}
+div.v-slide-group__prev {
+  position: absolute;
+  left: -5px;
+  min-width: 40px;
+  height: 30px;
+  align-items: start;
+  margin-top: -35px;
+}
+</style>
diff --git a/custom_components/mass/frontend/src/views/LibraryArtists.vue b/custom_components/mass/frontend/src/views/LibraryArtists.vue
index 28c36ef9..b4576d19 100644
--- a/custom_components/mass/frontend/src/views/LibraryArtists.vue
+++ b/custom_components/mass/frontend/src/views/LibraryArtists.vue
@@ -4,6 +4,12 @@
     :items="items"
     :show-providers="true"
     :load-data="loadItems"
+    :show-album-artists-only-filter="true"
+    @toggle-album-artists-only="
+      (e) => {
+        albumArtistsOnly = e;
+      }
+    "
   />
 </template>
 
@@ -17,6 +23,7 @@ import { store } from "../plugins/store";
 
 const { t } = useI18n();
 const items = ref<Artist[]>([]);
+const albumArtistsOnly = ref(false);
 
 const loadItems = async function (
   offset: number,
@@ -26,14 +33,21 @@ const loadItems = async function (
   inLibraryOnly = true
 ) {
   const library = inLibraryOnly || undefined;
-  return await api.getArtists(offset, limit, sort, library, search);
+  return await api.getArtists(
+    offset,
+    limit,
+    sort,
+    library,
+    search,
+    albumArtistsOnly.value
+  );
 };
 
 store.topBarTitle = t("artists");
 store.topBarContextMenuItems = [
   {
     label: "sync",
-    labelArgs:[],
+    labelArgs: [],
     action: () => {
       api.startSync(MediaType.ARTIST);
     },
@@ -43,5 +57,4 @@ store.topBarContextMenuItems = [
 onBeforeUnmount(() => {
   store.topBarContextMenuItems = [];
 });
-
 </script>
diff --git a/custom_components/mass/media_source.py b/custom_components/mass/media_source.py
index 5c07c0cf..9983609d 100644
--- a/custom_components/mass/media_source.py
+++ b/custom_components/mass/media_source.py
@@ -192,7 +192,8 @@ async def _build_playlists_listing(self, mass: MusicAssistant):
                 await asyncio.gather(
                     *[
                         self._build_item(mass, item, can_expand=True)
-                        for item in await mass.music.playlists.db_items(True)
+                        # we only grab the first page here becaus ethe HA media browser does not support paging
+                        for item in (await mass.music.playlists.db_items(True)).items
                     ],
                 ),
                 key=lambda x: x.title,
@@ -237,7 +238,8 @@ async def _build_artists_listing(self, mass: MusicAssistant):
                 await asyncio.gather(
                     *[
                         self._build_item(mass, artist, can_expand=True)
-                        for artist in await mass.music.artists.db_items(True)
+                        # we only grab the first page here becaus ethe HA media browser does not support paging
+                        for artist in (await mass.music.artists.db_items(True)).items
                     ],
                 ),
                 key=lambda x: x.title,
@@ -280,7 +282,8 @@ async def _build_albums_listing(self, mass: MusicAssistant):
                 await asyncio.gather(
                     *[
                         self._build_item(mass, album, can_expand=True)
-                        for album in await mass.music.albums.db_items(True)
+                        # we only grab the first page here becaus ethe HA media browser does not support paging
+                        for album in (await mass.music.albums.db_items(True)).items
                     ],
                 ),
                 key=lambda x: x.title,
@@ -323,7 +326,8 @@ async def _build_tracks_listing(self, mass: MusicAssistant):
                 await asyncio.gather(
                     *[
                         self._build_item(mass, track, can_expand=False)
-                        for track in await mass.music.tracks.db_items(True)
+                        # we only grab the first page here becaus ethe HA media browser does not support paging
+                        for track in (await mass.music.tracks.db_items(True)).items
                     ],
                 ),
                 key=lambda x: x.title,
@@ -347,7 +351,8 @@ async def _build_radio_listing(self, mass: MusicAssistant):
                     self._build_item(
                         mass, track, can_expand=False, media_class=media_class
                     )
-                    for track in await mass.music.radio.db_items(True)
+                    # we only grab the first page here becaus ethe HA media browser does not support paging
+                    for track in (await mass.music.radio.db_items(True)).items
                 ],
             ),
         )
diff --git a/custom_components/mass/player_controls.py b/custom_components/mass/player_controls.py
index b1dffcfd..1b378b55 100644
--- a/custom_components/mass/player_controls.py
+++ b/custom_components/mass/player_controls.py
@@ -52,6 +52,7 @@
     SLIMPROTO_DOMAIN,
     SLIMPROTO_EVENT,
     SONOS_DOMAIN,
+    VOLUMIO_DOMAIN,
 )
 
 LOGGER = logging.getLogger(__name__)
@@ -448,9 +449,14 @@ class KodiPlayer(HassPlayer):
 
     async def play_url(self, url: str) -> None:
         """Play the specified url on the player."""
+        if self.mass.streams.base_url not in url:
+            # use base implementation if 3rd party url provided...
+            await super().play_url(url)
+            return
+
+        self.logger.debug("play_url: %s", url)
         if not self.powered:
             await self.power(True)
-        self.logger.debug("play_url: %s", url)
 
         if self.state in (PlayerState.PLAYING, PlayerState.PAUSED):
             await self.stop()
@@ -508,6 +514,10 @@ def on_update(self) -> None:
 
     async def play_url(self, url: str) -> None:
         """Play the specified url on the player."""
+        if self.mass.streams.base_url not in url:
+            # use base implementation if 3rd party url provided...
+            await super().play_url(url)
+            return
         self._attr_powered = True
         if self._attr_use_mute_as_power:
             await self.volume_mute(False)
@@ -519,7 +529,7 @@ async def play_url(self, url: str) -> None:
             "media_id": url,
             "media_type": f"audio/{self.active_queue.settings.stream_type.value}",
             "enqueue": False,
-            "stream_type": "LIVE",
+            "stream_type": "BUFFERED",
             "title": f" Streaming from {DEFAULT_NAME}",
         }
         await self.hass.async_add_executor_job(
@@ -632,6 +642,11 @@ async def pause(self) -> None:
     async def play_url(self, url: str) -> None:
         """Play the specified url on the player."""
         self._sonos_paused = False
+        if self.mass.streams.base_url not in url:
+            # use base implementation if 3rd party url provided...
+            await super().play_url(url)
+            return
+
         self._attr_powered = True
         if self._attr_use_mute_as_power:
             await self.volume_mute(False)
@@ -683,6 +698,11 @@ class DlnaPlayer(HassPlayer):
 
     async def play_url(self, url: str) -> None:
         """Play the specified url on the player."""
+        if self.mass.streams.base_url not in url:
+            # use base implementation if 3rd party url provided...
+            await super().play_url(url)
+            return
+
         if not self.powered:
             await self.power(True)
         # pylint: disable=protected-access
@@ -730,6 +750,16 @@ def __init__(self, *args, **kwargs) -> None:
         )
         super().__init__(*args, **kwargs)
 
+    @property
+    def default_stream_type(self) -> ContentType:
+        """Return the default content type to use for streaming."""
+        # if any of the players supports FLAC, prefer that
+        for child_player in self.get_child_players(False, False):
+            if child_player.default_stream_type == ContentType.FLAC:
+                return ContentType.FLAC
+        # fallback to MP3
+        return ContentType.MP3
+
     @property
     def powered(self) -> bool:
         """Return power state."""
@@ -899,6 +929,29 @@ def on_child_update(self, player_id: str, changed_keys: set) -> None:
         super().on_child_update(player_id, changed_keys)
 
 
+class VolumioPlayer(HassPlayer):
+    """Representation of Hass player from Volumio integration."""
+
+    _attr_stream_type: ContentType = ContentType.MP3
+
+    async def play_url(self, url: str) -> None:
+        """Play the specified url on the player."""
+        # a lot of players do not power on at playback request so send power on from here
+        if not self.powered:
+            await self.power(True)
+        self.logger.debug("play_url: %s", url)
+        self._attr_current_url = url
+        await self.entity.async_play_media(
+            MEDIA_TYPE_MUSIC,
+            {
+                "service": "webradio",
+                "type": "webradio",
+                "title": DEFAULT_NAME,
+                "uri": url,
+            },
+        )
+
+
 PLAYER_MAPPING = {
     CAST_DOMAIN: CastPlayer,
     DLNA_DOMAIN: DlnaPlayer,
@@ -907,6 +960,7 @@ def on_child_update(self, player_id: str, changed_keys: set) -> None:
     SONOS_DOMAIN: SonosPlayer,
     GROUP_DOMAIN: HassGroupPlayer,
     KODI_DOMAIN: KodiPlayer,
+    VOLUMIO_DOMAIN: VolumioPlayer,
 }
 
 
diff --git a/custom_components/mass/translations/frontend/en.json b/custom_components/mass/translations/frontend/en.json
index 126b0782..63620b69 100644
--- a/custom_components/mass/translations/frontend/en.json
+++ b/custom_components/mass/translations/frontend/en.json
@@ -14,6 +14,8 @@
   "radios": "Radio",
   "browse": "Browse",
   "search": "Search",
+  "try_global_search": "Try global search",
+  "topresult": "Top result",
   "settings": "Settings",
   "basic_settings": "Basic settings",
   "advanced_settings": "Advanced settings",
@@ -138,7 +140,9 @@
     "search": "Show/hide search input",
     "refresh": "Refresh the items listing",
     "refresh_new_content": "New content is available, click to refresh the listing",
-    "select_items": "Select multiple items"
+    "select_items": "Select multiple items",
+    "linked": "This provideritem is linked to the current itemdetails",
+    "album_artist_filter": "Toggle album-artist filter"
   },
   "create_playlist": "Create new playlist on {0}"
 }
diff --git a/custom_components/mass/translations/frontend/nl.json b/custom_components/mass/translations/frontend/nl.json
index 887240d0..7d0ee32d 100644
--- a/custom_components/mass/translations/frontend/nl.json
+++ b/custom_components/mass/translations/frontend/nl.json
@@ -14,6 +14,8 @@
   "radios": "Radio",
   "browse": "Bladeren",
   "search": "Zoeken",
+  "try_global_search": "Try global search",
+  "topresult": "Top resultaat",
   "settings": "Instellingen",
   "basic_settings": "Basisinstellingen",
   "advanced_settings": "Geavanceerde instellingen",
@@ -137,7 +139,9 @@
     "search": "Toon/verberg zoekinvoer",
     "refresh": "De lijst verversen",
     "refresh_new_content": "Er is nieuwe inhoud beschikbaar, klik om te verversen",
-    "select_items": "Meerdere items selecteren"
+    "select_items": "Meerdere items selecteren",
+    "linked": "Dit provideritem is gelinkt aan de itemdetails",
+    "album_artist_filter": "Schakel filter in/uit om enkel albumartiesten te tonen"
   },
   "create_playlist": "Maak een nieuwe playlist aan op {0}"
 }
diff --git a/custom_components/mass/websockets.py b/custom_components/mass/websockets.py
index fce3532b..94eb16a7 100644
--- a/custom_components/mass/websockets.py
+++ b/custom_components/mass/websockets.py
@@ -127,6 +127,7 @@ async def async_get_mass_func(
         vol.Optional(SORT, default="sort_name"): str,
         vol.Optional(LIBRARY): bool,
         vol.Optional(SEARCH): str,
+        vol.Optional("album_artists_only"): bool,
     }
 )
 @websocket_api.async_response
@@ -138,9 +139,14 @@ async def websocket_artists(
     mass: MusicAssistant,
 ) -> None:
     """Return artists."""
+    if msg.get("album_artists_only"):
+        func = mass.music.artists.album_artists
+    else:
+        func = mass.music.artists.db_items
+
     await connection.send_big_result(
         msg[ID],
-        await mass.music.artists.db_items(
+        await func(
             msg.get(LIBRARY),
             msg.get(SEARCH),
             limit=msg[LIMIT],
@@ -878,7 +884,12 @@ async def websocket_delete_db_item(
 
 
 @websocket_api.websocket_command(
-    {vol.Required(TYPE): f"{DOMAIN}/search", vol.Required("query"): str}
+    {
+        vol.Required(TYPE): f"{DOMAIN}/search",
+        vol.Required("query"): str,
+        vol.Optional("media_types", default=MediaType.ALL): list,
+        vol.Optional("limit", default=5): int,
+    }
 )
 @websocket_api.async_response
 @async_get_mass
@@ -889,7 +900,9 @@ async def websocket_search(
     mass: MusicAssistant,
 ) -> None:
     """Return Browse items."""
-    result = await mass.music.search(msg.get(URI))
+    result = await mass.music.search(
+        msg["query"], media_types=msg["media_types"], limit=msg["limit"]
+    )
     result = [x.to_dict() for x in result]
 
     await connection.send_big_result(