diff --git a/changelog.md b/changelog.md
index 118c165e9..e1a4c9061 100644
--- a/changelog.md
+++ b/changelog.md
@@ -24,7 +24,7 @@
 
 ### Fixed
 * `[phonebook][db]` Fixed reading contact without a number from database.
-
+* `[listview]` Faster window refresh and wrong refresh data fix. 
 * `[utilities]` Fix for UTF8 by character copies
 * `[gui]` Fix crash in font glyph rendering on screen
 * `[sms]` When opening a thread show it from the newest message  
diff --git a/module-apps/application-calendar/models/EventDetailModel.cpp b/module-apps/application-calendar/models/EventDetailModel.cpp
index 912a85e15..2b5b560e4 100644
--- a/module-apps/application-calendar/models/EventDetailModel.cpp
+++ b/module-apps/application-calendar/models/EventDetailModel.cpp
@@ -6,7 +6,7 @@
 EventDetailModel::EventDetailModel(app::Application *app) : application(app)
 {}
 
-int EventDetailModel::getItemCount() const
+auto EventDetailModel::requestRecordsCount() -> unsigned int
 {
     return internalData.size();
 }
diff --git a/module-apps/application-calendar/models/EventDetailModel.hpp b/module-apps/application-calendar/models/EventDetailModel.hpp
index d228f034f..087050ebd 100644
--- a/module-apps/application-calendar/models/EventDetailModel.hpp
+++ b/module-apps/application-calendar/models/EventDetailModel.hpp
@@ -15,7 +15,7 @@ class EventDetailModel : public app::InternalModel<gui::CalendarListItem *>, pub
 
     void loadData();
 
-    [[nodiscard]] int getItemCount() const override;
+    [[nodiscard]] auto requestRecordsCount() -> unsigned int override;
     [[nodiscard]] unsigned int getMinimalItemHeight() const override;
     gui::ListItem *getItem(gui::Order order) override;
     void requestRecords(const uint32_t offset, const uint32_t limit) override;
diff --git a/module-apps/application-calendar/windows/EventDetailWindow.cpp b/module-apps/application-calendar/windows/EventDetailWindow.cpp
index ed8d9e045..f5a29ecdf 100644
--- a/module-apps/application-calendar/windows/EventDetailWindow.cpp
+++ b/module-apps/application-calendar/windows/EventDetailWindow.cpp
@@ -44,7 +44,7 @@ namespace gui
     void EventDetailWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
     {
         if (mode == gui::ShowMode::GUI_SHOW_INIT) {
-            bodyList->setElementsCount(eventDetailModel->getItemCount());
+            bodyList->rebuildList();
         }
 
         eventDetailModel->loadData();
diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp
index 6f3ce12c5..fed27d5a1 100644
--- a/module-apps/application-messages/ApplicationMessages.cpp
+++ b/module-apps/application-messages/ApplicationMessages.cpp
@@ -1,6 +1,7 @@
 #include "ApplicationMessages.hpp"
 
 #include "application-messages/data/SMSTextToSearch.hpp"
+#include "messages/DBNotificationMessage.hpp"
 #include "windows/MessagesMainWindow.hpp"
 #include "windows/NewMessage.hpp"
 #include "windows/OptionsMessages.hpp"
@@ -13,7 +14,6 @@
 #include <MessageType.hpp>
 #include <Dialog.hpp>
 #include <i18/i18.hpp>
-#include <../module-services/service-db/messages/DBNotificationMessage.hpp>
 #include <service-db/api/DBServiceAPI.hpp>
 #include <cassert>
 #include <time/time_conversion.hpp>
@@ -41,11 +41,13 @@ namespace app
 
         if (msgl->messageType == MessageType::DBServiceNotification) {
             auto msg = dynamic_cast<db::NotificationMessage *>(msgl);
-            LOG_DEBUG("Received multicast");
+            LOG_DEBUG("Received notification");
             if (msg != nullptr) {
                 // window-specific actions
-                for (auto &[name, window] : windows) {
-                    window->onDatabaseMessage(msg);
+                if (msg->interface == db::Interface::Name::SMSThread || msg->interface == db::Interface::Name::SMS) {
+                    for (auto &[name, window] : windows) {
+                        window->onDatabaseMessage(msg);
+                    }
                 }
                 // app-wide actions
                 // <none>
@@ -71,8 +73,12 @@ namespace app
             case MessageType::DBQuery:
 
                 if (auto queryResponse = dynamic_cast<db::QueryResponse *>(resp)) {
-                    if (queryResponse->getResult()->handle()) {
-                        refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
+                    auto result = queryResponse->getResult();
+
+                    if (result->hasListener()) {
+                        if (result->handle()) {
+                            refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
+                        }
                     }
                 }
 
diff --git a/module-apps/application-messages/models/SearchResultsModel.cpp b/module-apps/application-messages/models/SearchResultsModel.cpp
index 22fac2191..34243bb71 100644
--- a/module-apps/application-messages/models/SearchResultsModel.cpp
+++ b/module-apps/application-messages/models/SearchResultsModel.cpp
@@ -71,9 +71,8 @@ namespace gui::model
             return app->searchEmpty();
         }
 
-        if (list != nullptr) {
-            list->setElementsCount(msgResponse->getMax());
-        }
+        assert(list);
+        list->setElementsCount(msgResponse->getMax());
 
         return this->updateRecords(std::move(records));
     }
diff --git a/module-apps/application-messages/windows/MessagesMainWindow.cpp b/module-apps/application-messages/windows/MessagesMainWindow.cpp
index c5234b146..e0048633e 100644
--- a/module-apps/application-messages/windows/MessagesMainWindow.cpp
+++ b/module-apps/application-messages/windows/MessagesMainWindow.cpp
@@ -162,13 +162,10 @@ namespace gui
     {
         auto *msgNotification = dynamic_cast<db::NotificationMessage *>(msgl);
         if (msgNotification != nullptr) {
-            // whatever notification had happened, rebuild
             if (msgNotification->interface == db::Interface::Name::SMSThread ||
                 msgNotification->interface == db::Interface::Name::SMS) {
 
-                if (msgNotification->type == db::Query::Type::Delete ||
-                    msgNotification->type == db::Query::Type::Update ||
-                    msgNotification->type == db::Query::Type::Create) {
+                if (msgNotification->dataModified()) {
 
                     rebuild();
 
diff --git a/module-apps/application-messages/windows/ThreadViewWindow.cpp b/module-apps/application-messages/windows/ThreadViewWindow.cpp
index b86310663..b2a8042cc 100644
--- a/module-apps/application-messages/windows/ThreadViewWindow.cpp
+++ b/module-apps/application-messages/windows/ThreadViewWindow.cpp
@@ -115,6 +115,9 @@ namespace gui
     void ThreadViewWindow::destroyTextItem()
     {
         body->erase(text);
+        if (text->parent == nullptr) {
+            delete (text);
+        }
         text = nullptr;
     }
 
diff --git a/module-apps/application-phonebook/ApplicationPhonebook.cpp b/module-apps/application-phonebook/ApplicationPhonebook.cpp
index eb5616d47..2e65b2d44 100644
--- a/module-apps/application-phonebook/ApplicationPhonebook.cpp
+++ b/module-apps/application-phonebook/ApplicationPhonebook.cpp
@@ -1,6 +1,7 @@
 #include "ApplicationPhonebook.hpp"
 #include "Dialog.hpp"
 #include "messages/QueryMessage.hpp"
+#include "messages/DBNotificationMessage.hpp"
 #include "models/PhonebookModel.hpp"
 #include "windows/PhonebookContact.hpp"
 #include "windows/PhonebookContactDetails.hpp"
@@ -10,8 +11,6 @@
 #include "windows/PhonebookNamecardOptions.hpp"
 #include "windows/PhonebookSearch.hpp"
 #include "windows/PhonebookSearchResults.hpp"
-#include <../module-services/service-db/messages/DBNotificationMessage.hpp>
-
 #include <service-appmgr/ApplicationManager.hpp>
 
 namespace app
@@ -35,11 +34,13 @@ namespace app
 
         if (msgl->messageType == MessageType::DBServiceNotification) {
             auto msg = dynamic_cast<db::NotificationMessage *>(msgl);
-            LOG_DEBUG("Received multicast");
+            LOG_DEBUG("Received notification");
             if (msg != nullptr) {
                 // window-specific actions
-                for (auto &[name, window] : windows) {
-                    window->onDatabaseMessage(msg);
+                if (msg->interface == db::Interface::Name::Contact) {
+                    for (auto &[name, window] : windows) {
+                        window->onDatabaseMessage(msg);
+                    }
                 }
                 // app-wide actions
                 // <none>
@@ -55,12 +56,17 @@ namespace app
             handled = true;
             switch (resp->responseTo) {
             case MessageType::DBQuery: {
-                auto queryResponse = dynamic_cast<db::QueryResponse *>(resp);
-                assert(queryResponse);
 
-                if (queryResponse->getResult()->handle()) {
-                    refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
+                if (auto queryResponse = dynamic_cast<db::QueryResponse *>(resp)) {
+                    auto result = queryResponse->getResult();
+
+                    if (result->hasListener()) {
+                        if (result->handle()) {
+                            refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
+                        }
+                    }
                 }
+
             } break;
             default:
                 break;
diff --git a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
index 97c1d09e8..bccc900d6 100644
--- a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
@@ -134,15 +134,9 @@ namespace gui
     {
         auto *msgNotification = dynamic_cast<db::NotificationMessage *>(msgl);
         if (msgNotification != nullptr) {
-            // whatever notification had happened, rebuild
             if (msgNotification->interface == db::Interface::Name::Contact) {
 
-                if (msgNotification->type == db::Query::Type::Delete ||
-                    msgNotification->type == db::Query::Type::Update ||
-                    msgNotification->type == db::Query::Type::Create) {
-
-                    LOG_INFO("I CO MAMY type? %d", (int)msgNotification->type);
-                    LOG_INFO("I CO MAMY intefejs? %d", (int)msgNotification->interface);
+                if (msgNotification->dataModified()) {
 
                     rebuild();
 
diff --git a/module-db/Common/Query.cpp b/module-db/Common/Query.cpp
index 4c70a6397..137522e06 100644
--- a/module-db/Common/Query.cpp
+++ b/module-db/Common/Query.cpp
@@ -32,12 +32,14 @@ std::shared_ptr<Query> QueryResult::getRequestQuery() const noexcept
     return requestQuery;
 }
 
+bool QueryResult::hasListener() const noexcept
+{
+    return !(requestQuery == nullptr || requestQuery->getQueryListener() == nullptr);
+}
+
 bool QueryResult::handle()
 {
     if (requestQuery == nullptr || requestQuery->getQueryListener() == nullptr) {
-
-        // Temporary solution for not handled DBQueries in Messages application.
-        return false;
         throw std::runtime_error("No listener to handle query");
     }
 
diff --git a/module-db/Common/Query.hpp b/module-db/Common/Query.hpp
index 3e89df7e4..2ece66a38 100644
--- a/module-db/Common/Query.hpp
+++ b/module-db/Common/Query.hpp
@@ -52,6 +52,7 @@ namespace db
 
         virtual bool handle();
 
+        [[nodiscard]] bool hasListener() const noexcept;
         [[nodiscard]] virtual auto debugInfo() const -> std::string = 0;
 
       protected:
diff --git a/module-db/Interface/ThreadRecord.cpp b/module-db/Interface/ThreadRecord.cpp
index d72b4ab88..3e9d1724f 100644
--- a/module-db/Interface/ThreadRecord.cpp
+++ b/module-db/Interface/ThreadRecord.cpp
@@ -121,19 +121,18 @@ ThreadRecord ThreadRecordInterface::GetByContact(uint32_t contact_id)
 
 std::unique_ptr<db::QueryResult> ThreadRecordInterface::runQuery(std::shared_ptr<db::Query> query)
 {
-    if (const auto local_query = dynamic_cast<const db::query::SMSSearch *>(query.get())) {
-        auto db_result =
-            smsDB->threads.getBySMSQuery(local_query->text, local_query->starting_postion, local_query->depth);
+    if (const auto localQuery = dynamic_cast<const db::query::SMSSearch *>(query.get())) {
+        auto dbResult = smsDB->threads.getBySMSQuery(localQuery->text, localQuery->starting_postion, localQuery->depth);
 
-        auto response = std::make_unique<db::query::SMSSearchResult>(db_result.first, db_result.second);
+        auto response = std::make_unique<db::query::SMSSearchResult>(dbResult.first, dbResult.second);
         response->setRequestQuery(query);
         return response;
     }
 
-    if (const auto local_query = dynamic_cast<const db::query::SMSThreadsGet *>(query.get())) {
-        auto db_result = smsDB->threads.getLimitOffset(local_query->offset, local_query->limit);
+    if (const auto localQuery = dynamic_cast<const db::query::SMSThreadsGet *>(query.get())) {
+        auto dbResult = smsDB->threads.getLimitOffset(localQuery->offset, localQuery->limit);
 
-        auto response = std::make_unique<db::query::SMSThreadsGetResults>(db_result);
+        auto response = std::make_unique<db::query::SMSThreadsGetResults>(dbResult);
         response->setRequestQuery(query);
         return response;
     }
diff --git a/module-db/queries/sms/QuerySMSThreadsGet.cpp b/module-db/queries/sms/QuerySMSThreadsGet.cpp
index 315d68ff9..050701f1b 100644
--- a/module-db/queries/sms/QuerySMSThreadsGet.cpp
+++ b/module-db/queries/sms/QuerySMSThreadsGet.cpp
@@ -1,4 +1,5 @@
 #include <Tables/ThreadsTable.hpp>
+#include <utility>
 #include "QuerySMSThreadsGet.hpp"
 
 namespace db::query
@@ -12,7 +13,8 @@ namespace db::query
         return "SMSThreadsGet";
     }
 
-    SMSThreadsGetResults::SMSThreadsGetResults(std::vector<ThreadsTableRow> result_rows) : results(result_rows)
+    SMSThreadsGetResults::SMSThreadsGetResults(std::vector<ThreadsTableRow> result_rows)
+        : results(std::move(result_rows))
     {}
 
     auto SMSThreadsGetResults::getResults() const -> std::vector<ThreadsTableRow>
diff --git a/module-gui/gui/widgets/GridLayout.cpp b/module-gui/gui/widgets/GridLayout.cpp
index 15cfed6ce..339999c55 100644
--- a/module-gui/gui/widgets/GridLayout.cpp
+++ b/module-gui/gui/widgets/GridLayout.cpp
@@ -21,7 +21,7 @@ void GridLayout::resizeItems()
     uint32_t el_in_x = area().w / grid.x;
     uint32_t el_in_y = area().h / grid.y;
 
-    colSize = children.size() < area().h / grid.x ? children.size() : area().h / grid.x;
+    colSize = children.size() < area().w / grid.x ? children.size() : area().w / grid.x;
     rowSize = colSize != 0 ? children.size() / colSize : 1;
 
     uint32_t strech_x     = 0;
diff --git a/module-services/service-db/messages/DBNotificationMessage.cpp b/module-services/service-db/messages/DBNotificationMessage.cpp
index 62f180938..8a3ef818d 100644
--- a/module-services/service-db/messages/DBNotificationMessage.cpp
+++ b/module-services/service-db/messages/DBNotificationMessage.cpp
@@ -5,4 +5,9 @@ namespace db
     NotificationMessage::NotificationMessage(db::Interface::Name interface, Query::Type type)
         : sys::DataMessage(MessageType::DBServiceNotification), interface(interface), type(type)
     {}
+
+    bool NotificationMessage::dataModified()
+    {
+        return type == db::Query::Type::Create || type == db::Query::Type::Update || type == db::Query::Type::Delete;
+    }
 } // namespace db
diff --git a/module-services/service-db/messages/DBNotificationMessage.hpp b/module-services/service-db/messages/DBNotificationMessage.hpp
index d4b898d61..c63b9eac5 100644
--- a/module-services/service-db/messages/DBNotificationMessage.hpp
+++ b/module-services/service-db/messages/DBNotificationMessage.hpp
@@ -14,5 +14,7 @@ namespace db
         NotificationMessage(db::Interface::Name interface, Query::Type type);
         const db::Interface::Name interface;
         const Query::Type type;
+
+        bool dataModified();
     };
 } // namespace db