diff --git a/geonode/facets/providers/keyword.py b/geonode/facets/providers/keyword.py index 570f2e04cbb..4d377538a2d 100644 --- a/geonode/facets/providers/keyword.py +++ b/geonode/facets/providers/keyword.py @@ -55,10 +55,16 @@ def get_facet_items( ) -> (int, list): logger.debug("Retrieving facets for %s", self.name) - q = queryset.values("keywords__slug", "keywords__name").filter(keywords__isnull=False) + filters = {"keywords__isnull": False} if topic_contains: - q = q.filter(keywords__name=topic_contains) - q = q.annotate(count=Count("keywords__slug")).order_by("-count") + filters["keywords__name__icontains"] = topic_contains + + q = ( + queryset.filter(**filters) + .values("keywords__slug", "keywords__name") + .annotate(count=Count("keywords__slug")) + .order_by("-count") + ) cnt = q.count() diff --git a/geonode/facets/providers/users.py b/geonode/facets/providers/users.py index a6399952868..80e47c50952 100644 --- a/geonode/facets/providers/users.py +++ b/geonode/facets/providers/users.py @@ -39,8 +39,8 @@ def name(self) -> str: def get_info(self, lang="en", **kwargs) -> dict: return { "name": "owner", - "key": "owner", # deprecated - "filter": "owner", + "key": "filter{owner.pk.in}", # deprecated + "filter": "filter{owner.pk.in}", "label": "Owner", "type": FACET_TYPE_USER, }