diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 26c6b34d098..2e36e884346 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2427,7 +2427,7 @@
 				$('#searchresults .emptycontent').addClass('emptycontent-search');
 				if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) {
 					this.$el.find('.nofilterresults').removeClass('hidden').
-						find('p').text(t('files', "No entries in this folder match '{filter}'", {filter:this._filter},  null, {'escape': false}));
+						find('h2').text(t('files', "No results in this folder for {filter}", {filter:this._filter},  null, {'escape': false}));
 				}
 			} else {
 				$('#searchresults').removeClass('filter-empty');
diff --git a/apps/files/js/search.js b/apps/files/js/search.js
index 625e4b13f4b..fa79d695165 100644
--- a/apps/files/js/search.js
+++ b/apps/files/js/search.js
@@ -63,7 +63,7 @@
 				 show size and last modified date on the right */
 				this.updateLegacyMimetype(result);
 
-				var $pathDiv = $('<div class="path"></div>').text(result.path);
+				var $pathDiv = $('<div class="path"></div>').text(result.path.substr(1));
 				$row.find('td.info div.name').after($pathDiv).text(result.name);
 
 				$row.find('td.result a').attr('href', result.link);
@@ -80,7 +80,7 @@
 				 show size and last modified date on the right */
 				this.updateLegacyMimetype(result);
 
-				var $pathDiv = $('<div class="path"></div>').text(result.path);
+				var $pathDiv = $('<div class="path"></div>').text(result.path.substr(1));
 				$row.find('td.info div.name').after($pathDiv).text(result.name);
 
 				$row.find('td.result a').attr('href', result.link);
diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
index f59cb7653d8..785b2bc72a4 100644
--- a/apps/files_sharing/templates/list.php
+++ b/apps/files_sharing/templates/list.php
@@ -8,7 +8,6 @@
 <div class="nofilterresults hidden">
 	<div class="icon-search"></div>
 	<h2><?php p($l->t('No entries found in this folder')); ?></h2>
-	<p></p>
 </div>
 
 <table id="filestable">
diff --git a/core/search/js/search.js b/core/search/js/search.js
index ef99cf7e961..e75060479b6 100644
--- a/core/search/js/search.js
+++ b/core/search/js/search.js
@@ -217,7 +217,7 @@
 					$status.addClass('emptycontent').removeClass('status');
 					$status.html('');
 					$status.append('<div class="icon-search"></div>');
-					$status.append('<h2>' + t('core', 'No search results in other folders') + '</h2>');
+					$status.append('<h2>' + t('core', 'No search results in other folders {filter}', {filter:this._filter}) + '</h2>');
 				} else {
 					$status.removeClass('emptycontent').addClass('status');
 					$status.text(n('core', '{count} search result in another folder', '{count} search results in other folders', count, {count:count}));