diff --git a/features/entryscape/organisation-page/index.tsx b/features/entryscape/organisation-page/index.tsx
index 31f38bd4f..5934763a3 100644
--- a/features/entryscape/organisation-page/index.tsx
+++ b/features/entryscape/organisation-page/index.tsx
@@ -230,7 +230,7 @@ export const OrganisationPage: FC = () => {
                   </Heading>
                   {entry.contact && entry.contact.email ? (
                     <CustomLink
-                      className="text-green-600 hover:no-underline"
+                      className="text-sm text-green-600 hover:no-underline"
                       href={entry.contact.email}
                     >
                       {entry.contact.name}
@@ -263,7 +263,7 @@ export const OrganisationPage: FC = () => {
                     >
                       {t("pages|organisation_page$org-no")}
                     </Heading>
-                    <p>{entry.organisationData?.orgClassification}</p>
+                    <p>{entry.organisationData.orgNumber}</p>
                   </div>
                 )}
 
diff --git a/features/search/search-filters/index.tsx b/features/search/search-filters/index.tsx
index dd17d055d..14c394acb 100644
--- a/features/search/search-filters/index.tsx
+++ b/features/search/search-filters/index.tsx
@@ -91,7 +91,7 @@ const FilterSearch: FC<FilterSearchProps> = ({
   );
 };
 
-const FindFilters = (
+const findFilters = (
   categoryFilters: SearchFacetValue[],
   checkedFilters: SearchFacetValue[] | undefined,
 ) => {
@@ -307,7 +307,7 @@ export const SearchFilters: FC<SearchFilterProps> = ({
                         >
                           <SearchFilter
                             title={value.title}
-                            usedFilters={FindFilters(
+                            usedFilters={findFilters(
                               value.facetValues,
                               search.request.facetValues,
                             )}
diff --git a/features/search/search-page/search-page-entryscape/search-page-provider-settings.ts b/features/search/search-page/search-page-entryscape/search-page-provider-settings.ts
index bf7ac45ca..6a0c5ca6e 100644
--- a/features/search/search-page/search-page-entryscape/search-page-provider-settings.ts
+++ b/features/search/search-page/search-page-entryscape/search-page-provider-settings.ts
@@ -148,9 +148,8 @@ export function createSearchProviderSettings(env: EnvSettings, lang: string) {
             indexOrder: 7,
             group: "type",
             showInSearchResult: true,
-            customProperties: [
-              "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/",
-            ],
+            customFilter:
+              "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/*",
           },
           {
             resource: "http://purl.org/dc/terms/conformsTo",
diff --git a/providers/search-provider/index.tsx b/providers/search-provider/index.tsx
index a50298c30..21782f560 100644
--- a/providers/search-provider/index.tsx
+++ b/providers/search-provider/index.tsx
@@ -672,7 +672,7 @@ class SearchProvider extends Component<SearchProviderProps, SearchContextData> {
         if (!f.includes("||")) return;
 
         const facetstring = f.split("||");
-        if (facetstring.length !== 9) return;
+        if (facetstring.length < 6) return;
 
         let facetType = ESType.unknown;
         switch (facetstring[3]) {
diff --git a/utilities/entrystore/entrystore.service.ts b/utilities/entrystore/entrystore.service.ts
index 496432b99..5ce96e164 100644
--- a/utilities/entrystore/entrystore.service.ts
+++ b/utilities/entrystore/entrystore.service.ts
@@ -456,76 +456,91 @@ export class EntrystoreService {
           customFilter: f.customFilter,
           customLabel: f.customLabel,
           customSearch: f.customSearch,
-          facetValues: metaFacet.values
-            .filter((value: ESFacetFieldValue) => {
-              if (f.customProperties && f.customProperties.length > 0) {
-                return f.customProperties.some((property) =>
-                  value.name.startsWith(property),
-                );
-              }
-              if (!value.name || value.name.trim() === "") return false;
-              if (!f?.dcatFilterEnabled) return true;
-
-              const choices: Choice[] = getTemplateChoices(
-                dcat,
-                f.dcatProperty,
-                f.dcatId,
-              );
-              return choices.some(
-                (choice: Choice) => choice.value === value.name,
-              );
-            })
-
-            .map((value: ESFacetFieldValue) => {
-              let displayName = value.name;
-              if (f?.dcatType === "choice") {
-                const choices = getTemplateChoices(
-                  dcat,
-                  f.dcatProperty,
-                  f.dcatId,
-                );
-                const choice = choices.find(
-                  (c: Choice) => c.value === value.name,
-                );
-                if (choice) {
-                  displayName = getLocalizedChoiceLabel(choice, this.lang);
-                }
-              } else {
-                displayName = entryCache.getValue(value.name) || value.name;
-                if (
-                  displayName.startsWith("http") &&
-                  f.customProperties &&
-                  f.customProperties.length > 0
-                ) {
-                  // Find the matching custom property that the displayName starts with
-                  const matchingProperty = f.customProperties.find((property) =>
-                    displayName.startsWith(property),
-                  );
-                  // Replace only if a matching property was found
-                  if (matchingProperty) {
-                    displayName = displayName.replace(matchingProperty, "");
-                  }
-                }
-              }
-              return {
-                count: value.count,
-                facet: metaFacet.predicate,
-                facetType: metaFacet.type,
-                facetValueString: `${metaFacet.predicate}||${value.name}||${
-                  f.related || false
-                }||${metaFacet.type}||${this.t(
-                  metaFacet.predicate,
-                )}||${displayName}||${f.customFilter}||${
-                  f.customSearch ? JSON.stringify(f.customSearch) : undefined
-                }||${f.customLabel}`,
-                related: f.related || false,
-                resource: value.name,
-                title: displayName,
-                customFilter: f.customFilter,
-                customLabel: f.customLabel,
-                customSearch: f.customSearch,
-              };
-            }),
+          facetValues:
+            metaFacet.values.length > 0
+              ? metaFacet.values
+                  .filter((value: ESFacetFieldValue) => {
+                    if (f.customProperties && f.customProperties.length > 0) {
+                      return f.customProperties.some((property) =>
+                        value.name.startsWith(property),
+                      );
+                    }
+                    if (!value.name || value.name.trim() === "") return false;
+                    if (!f?.dcatFilterEnabled) return true;
+
+                    const choices: Choice[] = getTemplateChoices(
+                      dcat,
+                      f.dcatProperty,
+                      f.dcatId,
+                    );
+                    return choices.some(
+                      (choice: Choice) => choice.value === value.name,
+                    );
+                  })
+                  .map((value: ESFacetFieldValue) => {
+                    let displayName = value.name;
+                    if (f?.dcatType === "choice") {
+                      const choices = getTemplateChoices(
+                        dcat,
+                        f.dcatProperty,
+                        f.dcatId,
+                      );
+                      const choice = choices.find(
+                        (c: Choice) => c.value === value.name,
+                      );
+                      if (choice) {
+                        displayName = getLocalizedChoiceLabel(
+                          choice,
+                          this.lang,
+                        );
+                      }
+                    } else {
+                      displayName =
+                        entryCache.getValue(value.name) || value.name;
+                    }
+                    return {
+                      count: value.count,
+                      facet: metaFacet.predicate,
+                      facetType: metaFacet.type,
+                      facetValueString: `${metaFacet.predicate}||${
+                        value.name
+                      }||${f.related || false}||${metaFacet.type}||${this.t(
+                        metaFacet.predicate,
+                      )}||${displayName}||${f.customFilter}||${
+                        f.customSearch
+                          ? JSON.stringify(f.customSearch)
+                          : undefined
+                      }||${f.customLabel}`,
+                      related: f.related || false,
+                      resource: value.name,
+                      title: displayName,
+                      customFilter: f.customFilter,
+                      customLabel: f.customLabel,
+                      customSearch: f.customSearch,
+                    };
+                  })
+              : [
+                  {
+                    count: 0,
+                    facet: metaFacet.predicate,
+                    facetType: metaFacet.type,
+                    facetValueString: `${metaFacet.predicate}||${
+                      f.customFilter
+                    }||${f.related || false}||${metaFacet.type}||${this.t(
+                      metaFacet.predicate,
+                    )}||${f.customFilter}||${f.customFilter}||${
+                      f.customSearch
+                        ? JSON.stringify(f.customSearch)
+                        : undefined
+                    }||${f.customLabel}`,
+                    related: false,
+                    resource: "",
+                    title: "",
+                    customFilter: f.customFilter,
+                    customSearch: f.customSearch,
+                    customLabel: f.customLabel,
+                  },
+                ],
         };
       }
     }