diff --git a/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateProperty.php b/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateProperty.php
index 6ccf8b1..1157d89 100644
--- a/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateProperty.php
+++ b/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateProperty.php
@@ -73,7 +73,7 @@ public function getActivitiesMeetingQuery(Entity $entity, array $statusList): Se
                 'parentId',
                 'status',
                 'createdAt',
-                ['""', 'hasAttachment'],
+                ['false', 'hasAttachment'],
             ])
             ->where([
                 'OR' => [
@@ -122,8 +122,8 @@ public function getActivitiesCallQuery(Entity $entity, array $statusList): Selec
                 'name',
                 ['dateStart', 'dateStart'],
                 ['dateEnd', 'dateEnd'],
-                ['""', 'dateStartDate'],
-                ['""', 'dateEndDate'],
+                ['null', 'dateStartDate'],
+                ['null', 'dateEndDate'],
                 ['"Call"', '_scope'],
                 'assignedUserId',
                 'assignedUserName',
@@ -131,7 +131,7 @@ public function getActivitiesCallQuery(Entity $entity, array $statusList): Selec
                 'parentId',
                 'status',
                 'createdAt',
-                ['""', 'hasAttachment'],
+                ['false', 'hasAttachment'],
             ])
             ->where([
                 'OR' => [
@@ -174,9 +174,9 @@ public function getActivitiesEmailQuery(Entity $entity, array $statusList): Sele
                 'id',
                 'name',
                 ['dateSent', 'dateStart'],
-                ['""', 'dateEnd'],
-                ['""', 'dateStartDate'],
-                ['""', 'dateEndDate'],
+                ['null', 'dateEnd'],
+                ['null', 'dateStartDate'],
+                ['null', 'dateEndDate'],
                 ['"Email"', '_scope'],
                 'assignedUserId',
                 'assignedUserName',
diff --git a/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateRequest.php b/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateRequest.php
index 2beee31..32e0776 100644
--- a/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateRequest.php
+++ b/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateRequest.php
@@ -73,7 +73,7 @@ public function getActivitiesMeetingQuery(Entity $entity, array $statusList): Se
                 'parentId',
                 'status',
                 'createdAt',
-                ['""', 'hasAttachment'],
+                ['false', 'hasAttachment'],
             ])
             ->where([
                 'OR' => [
@@ -117,8 +117,8 @@ public function getActivitiesCallQuery(Entity $entity, array $statusList): Selec
                 'name',
                 ['dateStart', 'dateStart'],
                 ['dateEnd', 'dateEnd'],
-                ['""', 'dateStartDate'],
-                ['""', 'dateEndDate'],
+                ['null', 'dateStartDate'],
+                ['null', 'dateEndDate'],
                 ['"Call"', '_scope'],
                 'assignedUserId',
                 'assignedUserName',
@@ -126,7 +126,7 @@ public function getActivitiesCallQuery(Entity $entity, array $statusList): Selec
                 'parentId',
                 'status',
                 'createdAt',
-                ['""', 'hasAttachment'],
+                ['false', 'hasAttachment'],
             ])
             ->where([
                 'OR' => [
@@ -169,9 +169,9 @@ public function getActivitiesEmailQuery(Entity $entity, array $statusList): Sele
                 'id',
                 'name',
                 ['dateSent', 'dateStart'],
-                ['""', 'dateEnd'],
-                ['""', 'dateStartDate'],
-                ['""', 'dateEndDate'],
+                ['null', 'dateEnd'],
+                ['null', 'dateStartDate'],
+                ['null', 'dateEndDate'],
                 ['"Email"', '_scope'],
                 'assignedUserId',
                 'assignedUserName',