diff --git a/application/Espo/Modules/Crm/Resources/layouts/Account/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Account/filters.json
index 9235d4519c..d82ea75fc7 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Account/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Account/filters.json
@@ -1,15 +1,16 @@
 [
-	"assignedUser",
-	"billingAddress",
-	"createdAt",
+    "assignedUser",
+    "teams",
+    "createdAt",
     "createdBy",
+    "modifiedAt",
+    "billingAddress",
     "description",
-	"emailAddress",
-	"industry",
+    "emailAddress",
+    "industry",
     "phoneNumber",
     "targetLists",
-	"type",
-    "teams",
+    "type",
     "shippingAddress",
     "website"
 ]
\ No newline at end of file
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Call/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Call/filters.json
index 484a0c5d3e..54e801e466 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Call/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Call/filters.json
@@ -1,14 +1,14 @@
 [
-	"account",
 	"assignedUser",
+	"teams",
 	"createdAt",
 	"createdBy",
+	"modifiedAt",
+	"account",
 	"dateStart",
 	"direction",
-	"modifiedAt",
 	"status",
 	"parent",
-	"teams",
 	"users",
 	"contacts",
 	"leads"
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Campaign/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Campaign/filters.json
index 05520fb6a5..36de9585b1 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Campaign/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Campaign/filters.json
@@ -1,9 +1,10 @@
 [
-	"type",
-	"status",
-	"endDate",
+    "assignedUser",
+    "teams",
     "createdAt",
     "createdBy",
-    "assignedUser",
-    "teams"
+    "modifiedAt",
+    "type",
+    "status",
+    "endDate"
 ]
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Case/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Case/filters.json
index 1f43d0a659..6a6dd48a29 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Case/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Case/filters.json
@@ -1,13 +1,14 @@
 [
-	"account",
-	"assignedUser",
-	"contact",
-	"createdAt",
-	"createdBy",
-	"number",
-	"modifiedAt",
-	"status",
-	"priority",
-	"description",
-	"teams"
+    "assignedUser",
+    "teams",
+    "createdAt",
+    "createdBy",
+    "modifiedAt",
+    "account",
+    "contact",
+    "number",
+    "modifiedAt",
+    "status",
+    "priority",
+    "description"
 ]
\ No newline at end of file
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Contact/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/filters.json
index c8daa443fa..6a5dfb46da 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Contact/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Contact/filters.json
@@ -1,12 +1,13 @@
 [
-	"account",
-    "address",
-	"assignedUser",
-	"createdAt",
-    "createdBy",
-	"emailAddress",
-    "phoneNumber",
-	"title",
+    "assignedUser",
     "teams",
-	"targetLists"
+    "createdAt",
+    "createdBy",
+    "modifiedAt",
+    "account",
+    "address",
+    "emailAddress",
+    "phoneNumber",
+    "title",
+    "targetLists"
 ]
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Document/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Document/filters.json
index acd9fe1852..c5d7a06b9f 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Document/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Document/filters.json
@@ -1,10 +1,12 @@
 [
+    "assignedUser",
+    "teams",
     "accounts",
     "createdAt",
     "createdBy",
+    "modifiedAt",
     "expirationDate",
     "type",
     "status",
-    "publishDate",
-    "teams"
+    "publishDate"
 ]
diff --git a/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detail.json b/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detail.json
deleted file mode 100644
index d63bed7811..0000000000
--- a/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detail.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"label":"Overview","rows":[[{"name":"name"},false],[{"name":"subject"},{"name":"isHtml"}],[{"name":"body","fullWidth":"true"},false],[{"name":"attachments"},false]]}]
diff --git a/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detailSmall.json
deleted file mode 100644
index 3f0db9920f..0000000000
--- a/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detailSmall.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"label":"","rows":[[{"name":"name"}],[{"name":"isHtml"}],[{"name":"body"}],[{"name":"subject"}]]}]
\ No newline at end of file
diff --git a/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/filters.json b/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/filters.json
deleted file mode 100644
index 0637a088a0..0000000000
--- a/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/filters.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/application/Espo/Modules/Crm/Resources/layouts/KnowledgeBaseArticle/filters.json b/application/Espo/Modules/Crm/Resources/layouts/KnowledgeBaseArticle/filters.json
index e93420e23f..ba538fae24 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/KnowledgeBaseArticle/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/KnowledgeBaseArticle/filters.json
@@ -1,6 +1,7 @@
 [
     "createdAt",
     "createdBy",
+    "modifiedAt",
     "expirationDate",
     "language",
     "type",
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Lead/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/filters.json
index aba17ffe48..a3034da204 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Lead/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Lead/filters.json
@@ -1,9 +1,11 @@
 [
     "assignedUser",
-    "address",
-    "campaign",
+    "teams",
     "createdAt",
     "createdBy",
+    "modifiedAt",
+    "address",
+    "campaign",
     "emailAddress",
     "status",
     "source",
@@ -11,6 +13,5 @@
     "industry",
     "phoneNumber",
     "targetLists",
-    "teams",
     "createdAccount"
 ]
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Meeting/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Meeting/filters.json
index 32f986d439..2d1ecd4bfb 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Meeting/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Meeting/filters.json
@@ -1,14 +1,14 @@
 [
-	"account",
-	"assignedUser",
-	"createdAt",
-	"createdBy",
-	"dateStart",
-	"modifiedAt",
-	"status",
-	"parent",
-	"teams",
-	"users",
-	"contacts",
-	"leads"
+    "assignedUser",
+    "teams",
+    "createdAt",
+    "createdBy",
+    "modifiedAt",
+    "account",
+    "dateStart",
+    "status",
+    "parent",
+    "users",
+    "contacts",
+    "leads"
 ]
\ No newline at end of file
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Opportunity/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/filters.json
index fb92bc7f97..de26e65ef5 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Opportunity/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/filters.json
@@ -1,16 +1,17 @@
 [
+    "assignedUser",
+    "teams",
+    "createdAt",
+    "createdBy",
+    "modifiedAt",
     "account",
     "amountConverted",
     "amountWeightedConverted",
-    "assignedUser",
     "campaign",
-    "createdAt",
-    "createdBy",
     "closeDate",
     "contacts",
     "leadSource",
     "probability",
     "stage",
-    "description",
-    "teams"
+    "description"
 ]
diff --git a/application/Espo/Modules/Crm/Resources/layouts/TargetList/filters.json b/application/Espo/Modules/Crm/Resources/layouts/TargetList/filters.json
index 6e012b4184..2dba24561e 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/TargetList/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/TargetList/filters.json
@@ -1,6 +1,6 @@
 [
     "assignedUser",
+    "teams",
     "createdAt",
-    "createdBy",
-    "teams"
+    "createdBy"
 ]
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Task/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Task/filters.json
index 3ce7225488..621c91831b 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Task/filters.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Task/filters.json
@@ -1,14 +1,14 @@
 [
-	"account",
-	"assignedUser",
-	"createdAt",
+    "assignedUser",
+    "teams",
+    "createdAt",
     "createdBy",
-	"dateCompleted",
-	"dateStart",
-	"dateEnd",
-	"modifiedAt",
-	"status",
-	"parent",
-	"priority",
-    "teams"
+    "modifiedAt",
+    "account",
+    "dateCompleted",
+    "dateStart",
+    "dateEnd",
+    "status",
+    "parent",
+    "priority"
 ]
diff --git a/application/Espo/Resources/layouts/EmailTemplate/filters.json b/application/Espo/Resources/layouts/EmailTemplate/filters.json
index ae3b81c15a..7eded3f94a 100644
--- a/application/Espo/Resources/layouts/EmailTemplate/filters.json
+++ b/application/Espo/Resources/layouts/EmailTemplate/filters.json
@@ -1,5 +1,7 @@
 [
     "assignedUser",
+    "teams",
     "createdAt",
-    "teams"
+    "createdBy",
+    "modifiedAt"
 ]
\ No newline at end of file