1 files changed, 36 insertions, 9 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 95dd5cac2..00c17db14 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2730,12 +2730,18 @@ organization_type_pks_lazy = lazy(OrganizationType.get_or_create_pks, str)
 
 
 class Organization(Address, Merge, OwnPerms, BaseGenderedType, ValueGetter, MainItem):
-    TABLE_COLS = ("name", "organization_type", "address", "town")
-    # , "precise_town")
+    NEW_QUERY_ENGINE = True
+    TABLE_COLS = ("name", "organization_type__label", "address", "cached_town")
     SLUG = "organization"
     SHOW_URL = "show-organization"
     DELETE_URL = "delete-organization"
 
+    COL_LABELS = {
+        "organization_type__label": _("Organization"),
+        "cached_town": _("Town"),
+    }
+    CACHED_LABELS = ["cached_label", "cached_town"]
+
     # search parameters
     EXTRA_REQUEST_KEYS = {
         "precise_town": "precise_town__cached_label"
@@ -2979,19 +2985,29 @@ class Person(Address, Merge, OwnPerms, ValueGetter, MainItem):
         "surname",
         "raw_name",
         "email",
-        "person_types_list",
-        "attached_to",
-        "town",
+        "cached_person_types",
+        "attached_to__name",
+        "cached_town",
     )
     TABLE_COLS_ACCOUNT = (
         "name",
         "surname",
         "raw_name",
         "email",
-        "profiles_list",
-        "attached_to",
-        "town",
+        "cached_profiles",
+        "cached_person_types",
+        "attached_to__name",
+        "cached_town",
     )
+    NEW_QUERY_ENGINE = True
+    COL_LABELS = {
+        "attached_to__name": _("Organization"),
+        "cached_person_types": _("Person types"),
+        "cached_town": _("Town"),
+        "cached_profiles": _("Profiles"),
+    }
+    CACHED_LABELS = ["cached_label", "cached_person_types", "cached_town",
+                     "cached_profiles"]
     SHOW_URL = "show-person"
     MODIFY_URL = "person_modify"
     DELETE_URL = "person_delete"
@@ -3012,7 +3028,6 @@ class Person(Address, Merge, OwnPerms, ValueGetter, MainItem):
         "ishtaruser__isnull": "ishtaruser__isnull",
         "attached_to": "attached_to",
     }
-    COL_LABELS = {"attached_to": _("Organization")}
 
     # alternative names of fields for searches
     ALT_NAMES = {
@@ -3109,6 +3124,12 @@ class Person(Address, Merge, OwnPerms, ValueGetter, MainItem):
     cached_label = models.TextField(
         _("Cached name"), blank=True, default="", db_index=True
     )
+    cached_person_types = models.TextField(
+        _("Cached person types"), blank=True, default=""
+    )
+    cached_profiles = models.TextField(
+        _("Cached profiles"), blank=True, default=""
+    )
     DOWN_MODEL_UPDATE = ["author"]
 
     class Meta:
@@ -3211,6 +3232,12 @@ class Person(Address, Merge, OwnPerms, ValueGetter, MainItem):
             lbl += " ({})".format(attached_to)
         return lbl
 
+    def _generate_cached_person_types(self):
+        return self.person_types_list
+
+    def _generate_cached_profiles(self):
+        return self.profiles_list
+
     def fancy_str(self):
         values = ["<strong>"]
         values += [