diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 0a5db475f..6aec17336 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1157,6 +1157,7 @@
 
 		if ($feed_search) {
 			$search_qpart = "(UPPER(F1.title) LIKE UPPER('%$feed_search%') OR
+				UPPER(C1.title) LIKE UPPER('%$feed_search%') OR
 				UPPER(F1.feed_url) LIKE UPPER('%$feed_search%')) AND";
 		} else {
 			$search_qpart = "";
@@ -1406,6 +1407,17 @@
 				}
 
 			print "</select>";
+		} else {
+
+			print "<p>";
+
+			if (!$feed_search) { 
+				print_warning(__("You don't have any subscribed feeds."));
+			} else {
+				print_warning(__('No matching feeds found.'));
+			}
+			print "</p>";
+
 		}
 
 		print "<h3>".__('OPML')."</h3>
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index e8e1cd60e..c85751adb 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -510,9 +510,9 @@
 
 			print "<p>";
 			if (!$filter_search) {
-				print __('No filters defined.');
+				print_warning(__('No filters defined.'));
 			} else {
-				print __('No matching filters found.');
+				print_warning(__('No matching filters found.'));
 			}
 			print "</p>";
 
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index dd44c7865..165765b89 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -237,9 +237,9 @@
 		} else {
 			print "<p>";
 			if (!$label_search) {
-				print __('No labels defined.');
+				print_warning(__('No labels defined.'));
 			} else {
-				print __('No matching labels found.');
+				print_warning(__('No matching labels found.'));
 			}
 			print "</p>";
 
diff --git a/modules/pref-users.php b/modules/pref-users.php
index 73313a8ad..7e38fd5d4 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -478,9 +478,9 @@
 		} else {
 			print "<p>";
 			if (!$user_search) {
-				print __('No users defined.');
+				print_warning(__('No users defined.'));
 			} else {
-				print __('No matching users found.');
+				print_warning(__('No matching users found.'));
 			}
 			print "</p>";