diff --git a/src/librssguard/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp
index 5dd9a1fa9..e00a2e9c3 100644
--- a/src/librssguard/core/messagesmodel.cpp
+++ b/src/librssguard/core/messagesmodel.cpp
@@ -325,7 +325,9 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const {
     }
 
     case LOWER_TITLE_ROLE:
-      return messageAt(idx.row()).m_title.toLower();
+      return m_cache->containsData(idx.row())
+          ? m_cache->data(idx).toString().toLower()
+          : QSqlQueryModel::data(idx, Qt::ItemDataRole::EditRole).toString().toLower();
 
     case Qt::ItemDataRole::EditRole:
       return m_cache->containsData(idx.row())
diff --git a/src/librssguard/core/messagesproxymodel.cpp b/src/librssguard/core/messagesproxymodel.cpp
index 59c92bde7..35ab79103 100644
--- a/src/librssguard/core/messagesproxymodel.cpp
+++ b/src/librssguard/core/messagesproxymodel.cpp
@@ -17,7 +17,7 @@ MessagesProxyModel::MessagesProxyModel(MessagesModel* source_model, QObject* par
   setSortRole(Qt::ItemDataRole::EditRole);
   setSortCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
 
-  setFilterKeyColumn(MSG_DB_TITLE_INDEX);
+  setFilterKeyColumn(-1);
   setFilterRole(LOWER_TITLE_ROLE);
 
   setDynamicSortFilter(false);