diff --git a/package.json b/package.json
index c74293ee..cadb3823 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "vue-router": "^3.5.2",
     "vuex": "^3.6.2",
     "youtube-suggest": "^1.1.2",
-    "yt-channel-info": "^3.0.2",
+    "yt-channel-info": "^3.0.3",
     "yt-dash-manifest-generator": "1.1.0",
     "yt-trending-scraper": "^2.0.1",
     "ytdl-core": "^4.11.0",
diff --git a/src/renderer/components/ft-element-list/ft-element-list.js b/src/renderer/components/ft-element-list/ft-element-list.js
index 744355c1..095ed6be 100644
--- a/src/renderer/components/ft-element-list/ft-element-list.js
+++ b/src/renderer/components/ft-element-list/ft-element-list.js
@@ -16,11 +16,6 @@ export default Vue.extend({
       required: true
     }
   },
-  data: function () {
-    return {
-      test: 'hello'
-    }
-  },
   computed: {
     listType: function () {
       return this.$store.getters.getListType
diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index c10c6752..3d94c5d6 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1449,7 +1449,7 @@ export default Vue.extend({
       const droppedFrames = this.playerStats.videoPlaybackQuality.droppedVideoFrames
       const totalFrames = this.playerStats.videoPlaybackQuality.totalVideoFrames
       const frames = `${droppedFrames} / ${totalFrames}`
-      const resolution = `${this.selectedResolution}@${this.selectedFPS}fps`
+      const resolution = this.selectedResolution === 'auto' ? 'auto' : `${this.selectedResolution}@${this.selectedFPS}fps`
       const playerDimensions = `${this.playerStats.playerDimensions.width}x${this.playerStats.playerDimensions.height}`
       const statsArray = [
         [this.$t('Video.Stats.Video ID'), this.videoId],
diff --git a/src/renderer/views/History/History.vue b/src/renderer/views/History/History.vue
index 7e4b1db2..9703421c 100644
--- a/src/renderer/views/History/History.vue
+++ b/src/renderer/views/History/History.vue
@@ -10,7 +10,7 @@
     >
       <h3>{{ $t("History.History") }}</h3>
       <ft-input
-        v-show="activeData.length > 0"
+        v-show="fullData.length > 0"
         ref="searchBar"
         :placeholder="$t('History.Search bar placeholder')"
         :show-clear-text-button="true"
@@ -18,12 +18,19 @@
         @input="(input) => query = input"
       />
       <ft-flex-box
-        v-show="activeData.length === 0"
+        v-show="fullData.length === 0"
       >
         <p class="message">
           {{ $t("History['Your history list is currently empty.']") }}
         </p>
       </ft-flex-box>
+      <ft-flex-box
+        v-show="activeData.length === 0 && fullData.length > 0"
+      >
+        <p class="message">
+          {{ $t("History['Empty Search Message']") }}
+        </p>
+      </ft-flex-box>
       <ft-element-list
         v-if="activeData.length > 0 && !isLoading"
         :data="activeData"
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.vue b/src/renderer/views/UserPlaylists/UserPlaylists.vue
index 9ee97df0..06c19bcd 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.vue
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.vue
@@ -17,7 +17,7 @@
         />
       </h3>
       <ft-input
-        v-show="activeData.length > 0"
+        v-show="fullData.length > 0"
         ref="searchBar"
         :placeholder="$t('User Playlists.Search bar placeholder')"
         :show-clear-text-button="true"
@@ -25,12 +25,19 @@
         @input="(input) => query = input"
       />
       <ft-flex-box
-        v-show="activeData.length === 0"
+        v-show="fullData.length === 0"
       >
         <p class="message">
           {{ $t("User Playlists['Your saved videos are empty. Click on the save button on the corner of a video to have it listed here']") }}
         </p>
       </ft-flex-box>
+      <ft-flex-box
+        v-show="activeData.length === 0 && fullData.length > 0"
+      >
+        <p class="message">
+          {{ $t("User Playlists['Empty Search Message']") }}
+        </p>
+      </ft-flex-box>
       <ft-element-list
         v-if="activeData.length > 0 && !isLoading"
         :data="activeData"
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 947ad2ab..82c92dea 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -103,12 +103,14 @@ User Playlists:
     videos currently here will be migrated to a 'Favorites' playlist.
   Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Your saved videos are empty. Click on the save button on the corner of a video to have
     it listed here
+  Empty Search Message: There are no videos in this playlist that matches your search
   Search bar placeholder: Search in Playlist
 History:
   # On History Page
   History: History
   Watch History: Watch History
   Your history list is currently empty.: Your history list is currently empty.
+  Empty Search Message: There are no videos in your history that matches your search
   Search bar placeholder: "Search in History"
 Settings:
   # On Settings Page
diff --git a/yarn.lock b/yarn.lock
index 5e0dffcb..a438de97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9049,10 +9049,10 @@ youtube-suggest@^1.1.2:
     node-fetch "^2.6.0"
     smol-jsonp "^1.0.0"
 
-yt-channel-info@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yt-channel-info/-/yt-channel-info-3.0.2.tgz#8a481a3a11bd8c8e80db983692ede15e5f273ceb"
-  integrity sha512-c00T9Zs09F9InmLemk2hXt4gA7GYohGvPahLHllNaW1kSMVXJeaWbPd2P5/VBiMIf9b4zSXuTqLvsrjFjN1JVw==
+yt-channel-info@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yt-channel-info/-/yt-channel-info-3.0.3.tgz#3113aa505ca7511d52c02c4a7fbd16dc7c248a5d"
+  integrity sha512-M7JTFLWE+bA1t+s+H3sZ+FFV8VTaslhRFVB49I+ilBsemqAKa19EH+70uWdJrYgJQWSM5/hCSU26yBhsA8/evQ==
   dependencies:
     axios "^0.26.1"