diff --git a/webserver/public/index.html b/webserver/public/index.html
index 1cba1cd..c552f37 100644
--- a/webserver/public/index.html
+++ b/webserver/public/index.html
@@ -474,7 +474,8 @@
 						<div class="nav btn-clear-filter" data-ng-click="historyList.filter = null"><div class="mdi mdi-close small"></div></div>
 					</div>
 					<div class="hist-songs">
-						<div class="hist-sng" data-ng-repeat="h in filteredHistory(historyList.filter)" data-cid="{{h.song.cid}}">
+						<div class="hist-sng" data-ng-repeat="h in historyList.history" data-cid="{{h.song.cid}}" data-ng-show="filteredHistory(h, ">
+							<div class="nav">{{$index + 1}}</div>
 							<div class="nav btn-grab btn-grab-history">
 								<div class="mdi mdi-plus-circle-outline"></div>
 								<div class="popup playlists-grab-history playlists-grab">
diff --git a/webserver/public/lib/css/menus.css b/webserver/public/lib/css/menus.css
index 3414d9d..cb0b1aa 100644
--- a/webserver/public/lib/css/menus.css
+++ b/webserver/public/lib/css/menus.css
@@ -245,7 +245,7 @@ div.minicolors{
     text-overflow: ellipsis;
 }
 .hist-sng .texts {
-	width: calc(100% - 412px);
+	width: calc(100% - 452px);
 	float: left;
     margin: 20px 10px;
 }
diff --git a/webserver/public/lib/js/app.js b/webserver/public/lib/js/app.js
index 2953178..bc90345 100644
--- a/webserver/public/lib/js/app.js
+++ b/webserver/public/lib/js/app.js
@@ -7173,26 +7173,12 @@
 				return false;
 			};
 
-			$scope.filteredHistory = function(filterBy) {
-				var result = [];
-				if (filterBy == undefined || filterBy == null || filterBy == "") {
-					return $scope.historyList ? $scope.historyList.history : [];
-				}
-				angular.forEach($scope.historyList.history, function(h) {
-					try {
-						if (h.song.title.toLowerCase().indexOf(filterBy.toLowerCase()) > -1) {
-							result.push(h);
-						}
-						else if (h.song.cid.toLowerCase().indexOf(filterBy.toLowerCase()) > -1) {
-							result.push(h);
-						}
-						else if (h.user.un.toLowerCase().indexOf(filterBy.toLowerCase()) > -1) {
-							result.push(h);
-						}
-					}
-					catch (e) {}
-				});
-				return result;
+			$scope.filteredHistory = function(h, filterBy) {
+				try{
+					return !(filterBy = filterBy.toLowerCase()) || h.song.title.toLowerCase().indexOf(filterBy) > -1 || h.song.cid.toLowerCase().indexOf(filterBy) > -1 || h.user.un.toLowerCase().indexOf(filterBy) > -1;
+				} catch(e){
+					return true;
+				}
 			};
 
 			$scope.makeBadgeStyle = function(opts){