diff --git a/assets/icons/check-done.svg b/assets/icons/check-done.svg
new file mode 100644
index 000000000..d562da369
--- /dev/null
+++ b/assets/icons/check-done.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.5501 18L3.8501 12.3L5.2751 10.875L9.5501 15.15L18.7251 5.97498L20.1501 7.39998L9.5501 18Z" fill="currentColor"/>
+</svg>
diff --git a/assets/icons/chevron-down.svg b/assets/icons/chevron-down.svg
new file mode 100644
index 000000000..f7043d8ea
--- /dev/null
+++ b/assets/icons/chevron-down.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 10L12 16L6 10L7.4 8.6L12 13.2L16.6 8.6L18 10Z" fill="currentColor"/>
+</svg>
diff --git a/assets/icons/chevron-up.svg b/assets/icons/chevron-up.svg
new file mode 100644
index 000000000..391e06273
--- /dev/null
+++ b/assets/icons/chevron-up.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 14L12 8L18 14L16.6 15.4L12 10.8L7.4 15.4L6 14Z" fill="currentColor"/>
+</svg>
\ No newline at end of file
diff --git a/assets/icons/chevronDown.svg b/assets/icons/chevronDown.svg
deleted file mode 100644
index 8e103bca6..000000000
--- a/assets/icons/chevronDown.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-  <path d="M18 10L12 16L6 10L7.4 8.6L12 13.2L16.6 8.6L18 10Z" fill="#6E615A"/>
-</svg>
\ No newline at end of file
diff --git a/assets/icons/chevronUp.svg b/assets/icons/chevronUp.svg
deleted file mode 100644
index 878409e91..000000000
--- a/assets/icons/chevronUp.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-  <path d="M6 14L12 8L18 14L16.6 15.4L12 10.8L7.4 15.4L6 14Z" fill="#6E615A"/>
-</svg>
\ No newline at end of file
diff --git a/assets/icons/closeCross.svg b/assets/icons/cross.svg
similarity index 71%
rename from assets/icons/closeCross.svg
rename to assets/icons/cross.svg
index 8c3aea470..d1de276fc 100644
--- a/assets/icons/closeCross.svg
+++ b/assets/icons/cross.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-  <path d="M6.4 19L5 17.6L10.6 12L5 6.4L6.4 5L12 10.6L17.6 5L19 6.4L13.4 12L19 17.6L17.6 19L12 13.4L6.4 19Z" fill="#6E615A"/>
+  <path d="M6.4 19L5 17.6L10.6 12L5 6.4L6.4 5L12 10.6L17.6 5L19 6.4L13.4 12L19 17.6L17.6 19L12 13.4L6.4 19Z" fill="currentColor"/>
 </svg>
\ No newline at end of file
diff --git a/components/blocks/accordion-block/index.tsx b/components/blocks/accordion-block/index.tsx
index 72630b162..873483992 100644
--- a/components/blocks/accordion-block/index.tsx
+++ b/components/blocks/accordion-block/index.tsx
@@ -1,7 +1,7 @@
 import useTranslation from "next-translate/useTranslation";
 import { FC, useContext, useState } from "react";
 
-import CloseIcon from "@/assets/icons/closeCross.svg";
+import CrossIcon from "@/assets/icons/cross.svg";
 import PlusIcon from "@/assets/icons/plus.svg";
 import { HtmlParser } from "@/components/typography/html-parser";
 import { FaqFragment as IFaq } from "@/graphql/__generated__/operations";
@@ -38,7 +38,7 @@ export const AccordionBlock: FC<AccordionBlockProps> = ({
           {question}
         </span>
         {open ? (
-          <CloseIcon
+          <CrossIcon
             width={iconSize * 1.5}
             height={iconSize * 1.5}
             viewBox="0 0 24 24"
diff --git a/components/button/index.tsx b/components/button/index.tsx
index ec178c1b4..0a16818b8 100644
--- a/components/button/index.tsx
+++ b/components/button/index.tsx
@@ -21,6 +21,7 @@ const buttonVariants = cva(["button"], {
     variant: {
       primary: ["button--primary"],
       secondary: ["button--secondary"],
+      light: ["button--light"],
       plain: ["button--plain"],
       pink: ["button--pink"],
       filter: ["button--filter"],
@@ -37,26 +38,57 @@ type IconLabelProps = {
   size?: "xs" | "sm" | "lg";
   label?: string;
   iconPosition?: "left" | "right";
+  iconSizeBase?: number;
 };
 
-const IconLabel: FC<IconLabelProps> = ({ icon, label, size, iconPosition }) => {
+const IconLabel: FC<IconLabelProps> = ({
+  icon,
+  label,
+  size,
+  iconPosition,
+  iconSizeBase,
+}) => {
   const Icon = icon;
-  const { iconSize } = useContext(SettingsContext);
+  const { iconSize: contextIconSize } = useContext(SettingsContext);
 
   return (
     <>
       {iconPosition === "left" && Icon && (
         <Icon
-          height={size === "lg" ? 1.5 * iconSize : iconSize}
-          width={size === "lg" ? 1.5 * iconSize : iconSize}
+          height={
+            iconSizeBase
+              ? iconSizeBase
+              : size === "lg"
+              ? 1.5 * contextIconSize
+              : contextIconSize
+          }
+          width={
+            iconSizeBase
+              ? iconSizeBase
+              : size === "lg"
+              ? 1.5 * contextIconSize
+              : contextIconSize
+          }
           viewBox="0 0 24 24"
         />
       )}
       {label && <span>{label}</span>}
       {iconPosition === "right" && Icon && (
         <Icon
-          height={size === "lg" ? 1.5 * iconSize : iconSize}
-          width={size === "lg" ? 1.5 * iconSize : iconSize}
+          height={
+            iconSizeBase
+              ? iconSizeBase
+              : size === "lg"
+              ? 1.5 * contextIconSize
+              : contextIconSize
+          }
+          width={
+            iconSizeBase
+              ? iconSizeBase
+              : size === "lg"
+              ? 1.5 * contextIconSize
+              : contextIconSize
+          }
           viewBox="0 0 24 24"
         />
       )}
@@ -67,6 +99,7 @@ const IconLabel: FC<IconLabelProps> = ({ icon, label, size, iconPosition }) => {
 type ButtonProps = VariantProps<typeof buttonVariants> & {
   icon?: AddIcon;
   iconPosition?: "left" | "right";
+  iconSize?: number;
   label?: string;
 };
 
@@ -78,6 +111,7 @@ const Button: FC<
   className,
   icon,
   iconPosition,
+  iconSize,
   label,
   children,
   ...rest
@@ -90,6 +124,7 @@ const Button: FC<
     >
       <IconLabel
         size={size ? size : "lg"}
+        iconSizeBase={iconSize}
         iconPosition={iconPosition}
         icon={icon}
         label={label}
diff --git a/components/form/render-form/index.tsx b/components/form/render-form/index.tsx
index 0fc3e9639..0317d8571 100644
--- a/components/form/render-form/index.tsx
+++ b/components/form/render-form/index.tsx
@@ -2,8 +2,8 @@ import { Translate } from "next-translate";
 import useTranslation from "next-translate/useTranslation";
 import { ChangeEvent, DragEvent, FC, useCallback, useState } from "react";
 
-import ChevronDownIcon from "@/assets/icons/chevronDown.svg";
-import ChevronUpIcon from "@/assets/icons/chevronUp.svg";
+import ChevronDownIcon from "@/assets/icons/chevron-down.svg";
+import ChevronUpIcon from "@/assets/icons/chevron-up.svg";
 import { Button } from "@/components/button";
 import { Label } from "@/components/form/label";
 import { RadioInput } from "@/components/form/radio-input";
diff --git a/components/form/select/index.tsx b/components/form/select/index.tsx
index d644b9edf..20e92c6c8 100644
--- a/components/form/select/index.tsx
+++ b/components/form/select/index.tsx
@@ -1,6 +1,6 @@
 import { FC, InputHTMLAttributes, PropsWithChildren, useContext } from "react";
 
-import ChevronDownIcon from "@/assets/icons/chevronDown.svg";
+import ChevronDownIcon from "@/assets/icons/chevron-down.svg";
 import { SettingsContext } from "@/providers/settings-provider";
 
 interface SelectProps extends InputHTMLAttributes<HTMLSelectElement> {
diff --git a/components/navigation/container-nav/index.tsx b/components/navigation/container-nav/index.tsx
index 913a19ad6..9b5941d60 100644
--- a/components/navigation/container-nav/index.tsx
+++ b/components/navigation/container-nav/index.tsx
@@ -4,7 +4,7 @@ import { usePathname } from "next/navigation";
 import useTranslation from "next-translate/useTranslation";
 import { FC, KeyboardEvent, useEffect, useRef, useState } from "react";
 
-import CloseCrossIcon from "@/assets/icons/closeCross.svg";
+import CrossIcon from "@/assets/icons/cross.svg";
 import HamburgerIcon from "@/assets/icons/hamburger.svg";
 import { Button } from "@/components/button";
 import { ContainerDataFragment } from "@/graphql/__generated__/operations";
@@ -86,7 +86,7 @@ export const ContainerNav: FC<ContainerDpDwnProps> = ({ related }) => {
       {vw < 1124 && (
         <Button
           iconPosition="left"
-          icon={expanded ? CloseCrossIcon : HamburgerIcon}
+          icon={expanded ? CrossIcon : HamburgerIcon}
           label={related[0].name}
           onClick={handleToggle}
           className={`!button--large relative z-40 w-full md:w-[20rem] xl:hidden`}
diff --git a/components/navigation/form-nav/index.tsx b/components/navigation/form-nav/index.tsx
index ba98f59ca..898f464c3 100644
--- a/components/navigation/form-nav/index.tsx
+++ b/components/navigation/form-nav/index.tsx
@@ -11,8 +11,8 @@ import {
   useState,
 } from "react";
 
-import ChevronDownIcon from "@/assets/icons/chevronDown.svg";
-import ChevronUpIcon from "@/assets/icons/chevronUp.svg";
+import ChevronDownIcon from "@/assets/icons/chevron-down.svg";
+import ChevronUpIcon from "@/assets/icons/chevron-up.svg";
 import { Button } from "@/components/button";
 import { useClickOutside } from "@/hooks/use-click-outside";
 import { handleScroll } from "@/utilities/form-utils";
diff --git a/components/navigation/main-nav/index.tsx b/components/navigation/main-nav/index.tsx
index 4ccee5665..b5d0c4421 100644
--- a/components/navigation/main-nav/index.tsx
+++ b/components/navigation/main-nav/index.tsx
@@ -3,7 +3,7 @@ import { usePathname } from "next/navigation";
 import useTranslation from "next-translate/useTranslation";
 import { FC, useEffect, useRef, useState, useContext } from "react";
 
-import CloseCrossIcon from "@/assets/icons/closeCross.svg";
+import CrossIcon from "@/assets/icons/cross.svg";
 import HamburgerIcon from "@/assets/icons/hamburger.svg";
 import SearchIcon from "@/assets/icons/search.svg";
 import DataportalTestLogo from "@/assets/logos/dataportalTest.svg";
@@ -137,7 +137,7 @@ const MainNav: FC<MainNavProps> = ({ setOpenSideBar, openSideBar }) => {
           aria-expanded={openSideBar}
           aria-controls="sidebar"
           variant="plain"
-          icon={openSideBar ? CloseCrossIcon : HamburgerIcon}
+          icon={openSideBar ? CrossIcon : HamburgerIcon}
           iconPosition="left"
           onClick={() => setOpenSideBar(!openSideBar)}
           label={t("common|menu")}
diff --git a/features/search/search-filters/index.tsx b/features/search/search-filters/index.tsx
index 28d5d3ecd..73da91667 100644
--- a/features/search/search-filters/index.tsx
+++ b/features/search/search-filters/index.tsx
@@ -1,3 +1,4 @@
+import { createFocusTrap, FocusTrap } from "focus-trap";
 import useTranslation from "next-translate/useTranslation";
 import {
   FC,
@@ -6,8 +7,13 @@ import {
   useMemo,
   Dispatch,
   SetStateAction,
+  useRef,
+  useEffect,
 } from "react";
 
+import ChevronDownIcon from "@/assets/icons/chevron-down.svg";
+import ChevronUpIcon from "@/assets/icons/chevron-up.svg";
+import CrossIcon from "@/assets/icons/cross.svg";
 import FilterIcon from "@/assets/icons/filter.svg";
 import SearchIcon from "@/assets/icons/search.svg";
 import { Button } from "@/components/button";
@@ -48,7 +54,12 @@ interface FilterSearchProps {
 }
 
 type InputFilter = { [key: string]: string };
-export type SearchMode = "content" | "datasets" | "concepts" | "specifications";
+export type SearchMode =
+  | "content"
+  | "datasets"
+  | "concepts"
+  | "specifications"
+  | "organisations";
 
 const FilterSearch: FC<FilterSearchProps> = ({
   filterKey,
@@ -171,6 +182,31 @@ export const SearchFilters: FC<SearchFilterProps> = ({
   const { t } = useTranslation();
   const { iconSize } = useContext(SettingsContext);
   const [inputFilter, setInputFilter] = useState<InputFilter>({});
+  const ref = useRef<HTMLDivElement>(null);
+  const trapRef = useRef<FocusTrap | null>(null);
+
+  useEffect(() => {
+    if (showFilter && ref.current && window.innerWidth < 600) {
+      trapRef.current = createFocusTrap(ref.current, {
+        escapeDeactivates: false,
+        allowOutsideClick: true,
+      });
+      trapRef.current.activate();
+    }
+
+    if (showFilter && window.innerWidth < 600) {
+      document.body.style.overflow = "hidden";
+    } else {
+      document.body.style.overflow = "auto";
+    }
+
+    return () => {
+      if (trapRef.current) {
+        trapRef.current.deactivate();
+      }
+      document.body.style.overflow = "auto";
+    };
+  }, [showFilter]);
 
   const clearCurrentScrollPos = () => {
     if (typeof localStorage != "undefined" && typeof location != "undefined") {
@@ -214,6 +250,21 @@ export const SearchFilters: FC<SearchFilterProps> = ({
     setShowFilter(!showFilter);
   }
 
+  const MobileButton = ({ className }: { className?: string }) => {
+    return (
+      <Button
+        variant="secondary"
+        size="sm"
+        iconSize={iconSize * 1.5}
+        icon={showFilter ? CrossIcon : FilterIcon}
+        iconPosition="left"
+        label={showFilter ? t("common|close-filter") : t("common|show-filter")}
+        onClick={() => updateFilters()}
+        className={`md:hidden ${className ? className : ""}`}
+      />
+    );
+  };
+
   const groupedFacets = useMemo(() => {
     const grouped: { [key: string]: { [key: string]: SearchFacet } } = {};
 
@@ -290,10 +341,17 @@ export const SearchFilters: FC<SearchFilterProps> = ({
 
   return (
     <div id="SearchFilters" role="region" aria-label={t("common|filter")}>
+      <div
+        className={`fixed inset-none z-40 overflow-hidden bg-brownOpaque5 md:hidden 
+        ${showFilter ? "visible" : "hidden"}`}
+        onClick={() => setShowFilter(false)}
+      />
+
       <Button
         variant="plain"
         size="sm"
-        icon={FilterIcon}
+        icon={showFilter ? ChevronUpIcon : ChevronDownIcon}
+        iconSize={iconSize * 1.5}
         iconPosition="left"
         aria-label={
           showFilter ? t("common|hide-filter") : t("common|show-filter")
@@ -302,224 +360,259 @@ export const SearchFilters: FC<SearchFilterProps> = ({
         aria-controls="filter-content"
         onClick={() => updateFilters()}
         label={showFilter ? t("common|hide-filter") : t("common|show-filter")}
+        className="hidden items-center py-xs md:flex"
         disabled={
           search.loadingFacets && Object.keys(groupedFacets).length === 0
         }
       />
 
+      <MobileButton className="my-xl" />
+
       <div
+        ref={ref}
         id="filter-content"
-        className={`mt-lg border-t border-brown-400 pt-lg ${
+        className={`bg-pink-50 fixed inset-md z-50 w-auto border-t border-brown-400 md:static md:mt-xl md:bg-transparent md:pt-[1.875rem] ${
           showFilter ? "block" : "hidden"
         }`}
       >
-        {Object.entries(groupedFacets).map(([groupName, groupFacets]) => (
-          <div
-            id="group-container"
-            key={groupName}
-            className="mb-lg items-center md:flex"
-          >
-            {groupName !== "default" && (
-              <h4 className="mb-sm mr-md shrink-0 text-sm text-textSecondary md:mb-none md:w-[120px]">
-                {t(`filters|group$${groupName}`)}:
-              </h4>
-            )}
-            <ul
-              className="flex flex-col flex-wrap gap-md md:flex-row"
-              role="list"
-              aria-label={t("common|available-filters")}
+        <div className="flex h-full flex-col space-y-lg overflow-y-auto overscroll-contain p-lg md:gap-none md:space-y-sm md:p-none">
+          <MobileButton className="mb-lg" />
+
+          {Object.entries(groupedFacets).map(([groupName, groupFacets]) => (
+            <div
+              id="group-container"
+              key={groupName}
+              className="mb-md items-center border-b border-dashed border-brown-500 pb-lg md:!mb-sm md:flex md:border-none md:pb-none"
             >
-              {Object.entries(groupFacets)
-                .sort((a, b) => (a[1].indexOrder > b[1].indexOrder ? 1 : -1))
-                .map(([key, value], idx: number) => {
-                  const isLicense = false;
-                  const shouldFetchMore = value.show <= value.count;
-                  const show = (value && value.show) || 20;
-                  const facetValues = inputFilter[key]
-                    ? value?.facetValues.filter(
-                        (v) =>
-                          v.title
-                            ?.toLowerCase()
-                            .includes(inputFilter[key].toLowerCase()),
-                      )
-                    : value?.facetValues.slice(0, show);
-
-                  if (key !== hvd && key !== national) {
-                    return (
-                      <li key={`${value.title}-${idx}`} role="listitem">
-                        <SearchFilter
-                          title={value.title}
-                          usedFilters={FindFilters(
-                            value.facetValues,
-                            search.request.facetValues,
-                          )}
+              {groupName !== "default" && (
+                <h4 className="mb-sm mr-md shrink-0 text-sm text-textSecondary md:mb-none md:w-[120px]">
+                  {t(`filters|group$${groupName}`)}:
+                </h4>
+              )}
+              <ul
+                className="flex w-full flex-row flex-wrap gap-md"
+                role="list"
+                aria-label={t("common|available-filters")}
+              >
+                {Object.entries(groupFacets)
+                  .sort((a, b) => (a[1].indexOrder > b[1].indexOrder ? 1 : -1))
+                  .map(([key, value], idx: number) => {
+                    const isLicense = false;
+                    const shouldFetchMore = value.show <= value.count;
+                    const show = (value && value.show) || 20;
+                    const facetValues = inputFilter[key]
+                      ? value?.facetValues.filter(
+                          (v) =>
+                            v.title
+                              ?.toLowerCase()
+                              .includes(inputFilter[key].toLowerCase()),
+                        )
+                      : value?.facetValues.slice(0, show);
+
+                    if (key !== hvd && key !== national) {
+                      return (
+                        <li
+                          key={`${value.title}-${idx}`}
+                          role="listitem"
+                          className="w-full md:w-auto"
                         >
-                          <div className="absolute z-10 mr-lg mt-sm max-h-[600px] w-full overflow-y-auto bg-white shadow-md md:max-w-[20.625rem]">
-                            {(searchMode == "datasets" ||
-                              searchMode == "specifications") && (
-                              //only render on searchpage
-                              <>
-                                {isLicense ? (
-                                  <MarkAll
-                                    search={search}
-                                    toggleKey={key}
-                                    title={t(`filters|allchecktext$${key}`)}
-                                  />
-                                ) : (
-                                  <FilterSearch
-                                    filterKey={key}
-                                    filter={inputFilter}
-                                    setFilter={setInputFilter}
-                                    title={value.title}
-                                    fetchMore={() =>
-                                      shouldFetchMore &&
-                                      search.fetchMoreFacets(key)
-                                    }
-                                  />
-                                )}
-                              </>
+                          <SearchFilter
+                            title={value.title}
+                            usedFilters={FindFilters(
+                              value.facetValues,
+                              search.request.facetValues,
                             )}
-                            {/* List of filter options within this category */}
-                            <ul role="listbox" aria-multiselectable="true">
-                              {facetValues.map(
-                                (
-                                  facetValue: SearchFacetValue,
-                                  index: number,
-                                ) => (
-                                  <li
-                                    key={index}
-                                    role="option"
-                                    aria-selected={selected(key, facetValue)}
-                                  >
-                                    <button
-                                      className={`focus--in group relative flex w-full items-center break-all py-md pl-md pr-[3rem] text-left hover:bg-brown-100 ${
-                                        selected(key, facetValue) &&
-                                        "font-strong"
-                                      }`}
-                                      onClick={() => {
-                                        doSearch(key, facetValue);
-                                      }}
-                                      role="checkbox"
-                                      aria-checked={selected(key, facetValue)}
-                                    >
-                                      {facetValue.title || facetValue.resource}{" "}
-                                      ({facetValue.count})
-                                      {/* Decorative checkbox icon */}
-                                      <span
-                                        className="absolute right-md"
-                                        aria-hidden="true"
+                          >
+                            <div className="absolute z-10 mr-lg mt-sm max-h-[200px] w-full overflow-y-auto overscroll-contain border border-brown-200 bg-white shadow-md md:max-h-[600px] md:max-w-[20.625rem]">
+                              {(searchMode == "datasets" ||
+                                searchMode == "specifications" ||
+                                searchMode == "organisations") && (
+                                //only render on searchpage
+                                <>
+                                  {isLicense ? (
+                                    <MarkAll
+                                      search={search}
+                                      toggleKey={key}
+                                      title={t(`filters|allchecktext$${key}`)}
+                                    />
+                                  ) : (
+                                    <FilterSearch
+                                      filterKey={key}
+                                      filter={inputFilter}
+                                      setFilter={setInputFilter}
+                                      title={value.title}
+                                      fetchMore={() =>
+                                        shouldFetchMore &&
+                                        search.fetchMoreFacets(key)
+                                      }
+                                    />
+                                  )}
+                                </>
+                              )}
+                              {/* List of filter options within this category */}
+                              <ul role="listbox" aria-multiselectable="true">
+                                {facetValues
+                                  // .filter((v) => v.count > 0)
+                                  .map(
+                                    (
+                                      facetValue: SearchFacetValue,
+                                      index: number,
+                                    ) => (
+                                      <li
+                                        key={index}
+                                        role="option"
+                                        aria-selected={selected(
+                                          key,
+                                          facetValue,
+                                        )}
                                       >
-                                        <SearchCheckboxFilterIcon
-                                          isChecked={selected(key, facetValue)}
-                                          iconSize={iconSize}
-                                        />
-                                      </span>
-                                    </button>
-                                  </li>
-                                ),
+                                        <button
+                                          className={`focus--in group relative flex w-full items-center break-all py-md pl-md pr-[3rem] text-left hover:bg-brown-100 ${
+                                            selected(key, facetValue) &&
+                                            "font-strong"
+                                          }`}
+                                          onClick={() => {
+                                            doSearch(key, facetValue);
+                                          }}
+                                          role="checkbox"
+                                          aria-checked={selected(
+                                            key,
+                                            facetValue,
+                                          )}
+                                        >
+                                          {facetValue.title ||
+                                            facetValue.resource}{" "}
+                                          ({facetValue.count})
+                                          {/* Decorative checkbox icon */}
+                                          <span
+                                            className="absolute right-md mt-[0.375rem]"
+                                            aria-hidden="true"
+                                          >
+                                            <SearchCheckboxFilterIcon
+                                              isChecked={selected(
+                                                key,
+                                                facetValue,
+                                              )}
+                                              iconSize={iconSize}
+                                            />
+                                          </span>
+                                        </button>
+                                      </li>
+                                    ),
+                                  )}
+                              </ul>
+
+                              {value.facetValues.length > value.show && (
+                                <Button
+                                  variant="secondary"
+                                  size="sm"
+                                  className="mx-sm my-md"
+                                  onClick={() => {
+                                    search.fetchMoreFacets(key);
+                                  }}
+                                  disabled={search.loadingFacets}
+                                  label={
+                                    search.loadingFacets
+                                      ? t("common|loading")
+                                      : t("common|load-more")
+                                  }
+                                />
                               )}
-                            </ul>
-
-                            {value.facetValues.length > value.show && (
-                              <Button
-                                variant="secondary"
-                                size="sm"
-                                className="mx-sm my-md"
-                                onClick={() => {
-                                  search.fetchMoreFacets(key);
-                                }}
-                                disabled={search.loadingFacets}
-                                label={
-                                  search.loadingFacets
-                                    ? t("common|loading")
-                                    : t("common|load-more")
-                                }
-                              />
-                            )}
-                            {facetValues.length == 0 && (
-                              <div className="p-md">
-                                {t("pages|search$nohits")}
-                              </div>
-                            )}
-                          </div>
-                        </SearchFilter>
-                      </li>
-                    );
-                  } else if (key === hvd) {
-                    return (
-                      <SearchCheckboxFilter
-                        key={key}
-                        id="hvd_only"
-                        name="hvd"
-                        checked={activeCheckboxFilters.some(
-                          (filter) => filter.id === "hvd_only",
-                        )}
-                        onChange={() => doSearch(key, facetValues[0])}
-                        label={t(`resources|${key}`)}
-                        iconSize={iconSize}
-                      />
-                    );
-                  } else if (key === national) {
-                    return (
-                      <SearchCheckboxFilter
-                        key={key}
-                        id="national_only"
-                        name="National"
-                        checked={activeCheckboxFilters.some(
-                          (filter) => filter.id === "national_only",
-                        )}
-                        onChange={() => doSearch(key, facetValues[0])}
-                        label={t(`resources|${key}`)}
-                        iconSize={iconSize}
-                      />
-                    );
-                  }
-                })}
-
-              {searchMode == "datasets" && groupName == "distribution" && (
-                <SearchCheckboxFilter
-                  key="api_only"
-                  id="api_only"
-                  name="API"
-                  checked={activeCheckboxFilters.some(
-                    (filter) => filter.id === "api_only",
-                  )}
-                  onChange={() => {
-                    clearCurrentScrollPos();
-                    if (
-                      activeCheckboxFilters.some(
-                        (filter) => filter.id === "api_only",
-                      )
-                    ) {
-                      search
-                        .set({
-                          esRdfTypes: [
-                            ESRdfType.dataset,
-                            ESRdfType.esterms_IndependentDataService,
-                            ESRdfType.esterms_ServedByDataService,
-                          ],
-                          query: query,
-                        })
-                        .then(() => search.doSearch());
-                    } else {
-                      search
-                        .set({
-                          esRdfTypes: [
-                            ESRdfType.esterms_IndependentDataService,
-                            ESRdfType.esterms_ServedByDataService,
-                          ],
-                          query: query,
-                        })
-                        .then(() => search.doSearch());
+                              {facetValues.length == 0 && (
+                                <div className="p-md">
+                                  {t("pages|search$nohits")}
+                                </div>
+                              )}
+                            </div>
+                          </SearchFilter>
+                        </li>
+                      );
+                    } else if (key === hvd) {
+                      return (
+                        <SearchCheckboxFilter
+                          key={key}
+                          id="hvd_only"
+                          name="hvd"
+                          checked={activeCheckboxFilters.some(
+                            (filter) => filter.id === "hvd_only",
+                          )}
+                          onChange={() => doSearch(key, facetValues[0])}
+                          label={t(`resources|${key}`)}
+                          iconSize={iconSize}
+                        />
+                      );
+                    } else if (key === national) {
+                      return (
+                        <SearchCheckboxFilter
+                          key={key}
+                          id="national_only"
+                          name="National"
+                          checked={activeCheckboxFilters.some(
+                            (filter) => filter.id === "national_only",
+                          )}
+                          onChange={() => doSearch(key, facetValues[0])}
+                          label={t(`resources|${key}`)}
+                          iconSize={iconSize}
+                        />
+                      );
                     }
-                  }}
-                  label={t(`resources|api`)}
-                  iconSize={iconSize}
-                />
-              )}
-            </ul>
+                  })}
+
+                {searchMode == "datasets" && groupName == "distribution" && (
+                  <SearchCheckboxFilter
+                    key="api_only"
+                    id="api_only"
+                    name="API"
+                    checked={activeCheckboxFilters.some(
+                      (filter) => filter.id === "api_only",
+                    )}
+                    onChange={() => {
+                      clearCurrentScrollPos();
+                      if (
+                        activeCheckboxFilters.some(
+                          (filter) => filter.id === "api_only",
+                        )
+                      ) {
+                        search
+                          .set({
+                            esRdfTypes: [
+                              ESRdfType.dataset,
+                              ESRdfType.esterms_IndependentDataService,
+                              ESRdfType.esterms_ServedByDataService,
+                            ],
+                            query: query,
+                          })
+                          .then(() => search.doSearch());
+                      } else {
+                        search
+                          .set({
+                            esRdfTypes: [
+                              ESRdfType.esterms_IndependentDataService,
+                              ESRdfType.esterms_ServedByDataService,
+                            ],
+                            query: query,
+                          })
+                          .then(() => search.doSearch());
+                      }
+                    }}
+                    label={t(`resources|api`)}
+                    iconSize={iconSize}
+                  />
+                )}
+              </ul>
+            </div>
+          ))}
+          {/* Mobile active filters */}
+          <div className="md:hidden">
+            <SearchActiveFilters
+              search={search}
+              query={query}
+              searchMode={searchMode}
+              activeCheckboxFilters={activeCheckboxFilters}
+            />
           </div>
-        ))}
+          <MobileButton className="!mt-xl" />
+        </div>
       </div>
 
       <SearchActiveFilters
diff --git a/features/search/search-filters/search-active-filters/index.tsx b/features/search/search-filters/search-active-filters/index.tsx
index dff81a47e..99c8b097f 100644
--- a/features/search/search-filters/search-active-filters/index.tsx
+++ b/features/search/search-filters/search-active-filters/index.tsx
@@ -1,6 +1,6 @@
 import useTranslation from "next-translate/useTranslation";
 
-import CloseIcon from "@/assets/icons/closeCross.svg";
+import CrossIcon from "@/assets/icons/cross.svg";
 import TrashIcon from "@/assets/icons/trash.svg";
 import { Button } from "@/components/button";
 import { SearchContextData } from "@/providers/search-provider";
@@ -45,12 +45,11 @@ export function SearchActiveFilters({
   if (!hasActiveFilters()) return null;
 
   return (
-    <div className="mt-lg flex min-h-xl flex-col gap-md md:flex-row md:items-center">
-      <div className="flex flex-col flex-wrap gap-sm md:flex-row md:items-center md:gap-md">
-        <span className="text-textSecondary">
-          {t("common|active-filters")}:
-        </span>
-
+    <div className="mt-lg flex flex-col gap-md md:flex-row md:items-center">
+      <span className="w-[7.5rem] text-textSecondary">
+        {t("common|active-filters")}:
+      </span>
+      <div className="flex flex-row flex-wrap gap-md md:items-center">
         {search.request.facetValues?.map(
           (facetValue: SearchFacetValue, index: number) =>
             facetValue.facet !==
@@ -64,9 +63,9 @@ export function SearchActiveFilters({
                 aria-label={`${t("common|clear-filters")} ${
                   facetValue.title || facetValue.resource
                 }`}
-                icon={CloseIcon}
+                icon={CrossIcon}
                 iconPosition="right"
-                className="w-full justify-between py-md text-left font-strong md:w-auto md:py-[2px]"
+                className="w-fit justify-between py-xs text-left font-strong md:py-[2px]"
                 onClick={() => {
                   clearCurrentScrollPos();
                   search.toggleFacet(facetValue).then(() => {
@@ -84,9 +83,9 @@ export function SearchActiveFilters({
             size="xs"
             label={filter.label}
             aria-label={`${t("common|clear-filters")} ${filter.label}`}
-            icon={CloseIcon}
+            icon={CrossIcon}
             iconPosition="right"
-            className="w-full justify-between py-md text-left font-strong md:w-auto md:py-[2px]"
+            className="w-fit justify-between py-xs text-left font-strong md:py-[2px]"
             onClick={() => {
               clearCurrentScrollPos();
               if (filter.isApiFilter) {
@@ -112,8 +111,8 @@ export function SearchActiveFilters({
 
       {((search.request.facetValues &&
         search.request.facetValues.length >= 2) ||
-        activeCheckboxFilters.length > 2) && (
-        <div className="block whitespace-nowrap">
+        activeCheckboxFilters.length >= 2) && (
+        <div className="mt-lg block whitespace-nowrap md:mt-none">
           <Button
             variant="plain"
             size="sm"
@@ -136,6 +135,7 @@ export function SearchActiveFilters({
                 .then(() => search.doSearch());
             }}
             label={t("common|clear-filters")}
+            className="[&_svg]:h-[1.5rem] [&_svg]:w-[1.5rem]"
           />
         </div>
       )}
diff --git a/features/search/search-filters/search-filter/index.tsx b/features/search/search-filters/search-filter/index.tsx
index 3529e20f9..b2181738e 100644
--- a/features/search/search-filters/search-filter/index.tsx
+++ b/features/search/search-filters/search-filter/index.tsx
@@ -2,7 +2,7 @@ import FocusTrap from "focus-trap-react";
 import useTranslation from "next-translate/useTranslation";
 import { FC, PropsWithChildren, useContext, useEffect, useState } from "react";
 
-import ChevronDownIcon from "@/assets/icons/chevronDown.svg";
+import ChevronDownIcon from "@/assets/icons/chevron-down.svg";
 import { useClickOutside } from "@/hooks/use-click-outside";
 import { SettingsContext } from "@/providers/settings-provider";
 
@@ -53,7 +53,7 @@ export const SearchFilter: FC<PropsWithChildren<SearchFilterProps>> = ({
           onClick={() => handleOpen(!open)}
           className={`${
             open && "active"
-          } button button--secondary button--large md:button--small w-full justify-between md:justify-start md:py-[0.25rem]`}
+          } button button--secondary button--small w-fit py-xs md:justify-start`}
         >
           {`${title} ${usedFilters || ""}` || t("open")}
           <ChevronDownIcon
diff --git a/features/search/search-filters/search-select-filter/index.tsx b/features/search/search-filters/search-select-filter/index.tsx
new file mode 100644
index 000000000..962d27fdc
--- /dev/null
+++ b/features/search/search-filters/search-select-filter/index.tsx
@@ -0,0 +1,104 @@
+import FocusTrap from "focus-trap-react";
+import { FC, useContext, useState } from "react";
+
+import CheckDoneIcon from "@/assets/icons/check-done.svg";
+import ChevronDownIcon from "@/assets/icons/chevron-down.svg";
+import ChevronUpIcon from "@/assets/icons/chevron-up.svg";
+import { Button } from "@/components/button";
+import { useClickOutside } from "@/hooks/use-click-outside";
+import { SettingsContext } from "@/providers/settings-provider";
+
+interface SelectProps {
+  id: string;
+  label: string;
+  value?: string;
+  options: { value: string; label: string }[];
+  // eslint-disable-next-line no-unused-vars
+  onChange: (value: { target: { value: string } }) => void;
+}
+
+export const SearchSelectFilter: FC<SelectProps> = ({
+  id,
+  label,
+  value,
+  options,
+  onChange,
+}) => {
+  const [open, setOpen] = useState(false);
+  const [trapFocus, setTrapFocus] = useState(false);
+  const { iconSize } = useContext(SettingsContext);
+  const ref = useClickOutside<HTMLDivElement>(() => handleOpen(false));
+
+  const handleOpen = (value: boolean) => {
+    setOpen(value);
+    setTrapFocus(value);
+  };
+
+  const selectedOption = options.find((option) => option.value === value);
+  const selectedText = selectedOption ? selectedOption.label : label;
+
+  return (
+    <FocusTrap
+      active={trapFocus}
+      focusTrapOptions={{ allowOutsideClick: true }}
+    >
+      <div
+        ref={ref}
+        onKeyDown={(ev) => ev.key === "Escape" && handleOpen(false)}
+      >
+        <Button
+          id={id}
+          size="sm"
+          variant="secondary"
+          iconPosition="right"
+          icon={open ? ChevronUpIcon : ChevronDownIcon}
+          aria-expanded={open}
+          aria-haspopup="listbox"
+          onClick={() => handleOpen(!open)}
+          aria-labelledby={id}
+          label={selectedText}
+        />
+        {open && (
+          <div className={open ? "relative block" : "hidden"}>
+            <ul
+              className="absolute z-10 mt-sm border border-brown-200 bg-white shadow-lg"
+              role="listbox"
+              aria-labelledby={id}
+            >
+              {options.map((option) => (
+                <li
+                  key={option.value}
+                  role="option"
+                  aria-selected={option.value === value}
+                  className={`inline-flex w-full cursor-pointer hover:bg-brown-100`}
+                  onClick={() => {
+                    onChange({ target: { value: option.value } });
+                    handleOpen(false);
+                  }}
+                >
+                  <button
+                    className={`focus--in relative w-full text-nowrap py-sm pl-[2.25rem] pr-md text-left text-sm ${
+                      selectedOption?.value === option.value
+                        ? "bg-brown-100"
+                        : ""
+                    }`}
+                  >
+                    {selectedOption?.value === option.value && (
+                      <CheckDoneIcon
+                        className="absolute mt-xs -translate-x-[1.5rem]"
+                        height={iconSize}
+                        width={iconSize}
+                        viewBox={`0 0 ${iconSize * 1.5} ${iconSize * 1.5}`}
+                      />
+                    )}
+                    {option.label}
+                  </button>
+                </li>
+              ))}
+            </ul>
+          </div>
+        )}
+      </div>
+    </FocusTrap>
+  );
+};
diff --git a/features/search/search-input/index.tsx b/features/search/search-input/index.tsx
index 9f024d663..569bbfc00 100644
--- a/features/search/search-input/index.tsx
+++ b/features/search/search-input/index.tsx
@@ -1,7 +1,7 @@
 import useTranslation from "next-translate/useTranslation";
 import { Dispatch, FC, InputHTMLAttributes, SetStateAction } from "react";
 
-import CloseIcon from "@/assets/icons/closeCross.svg";
+import CrossIcon from "@/assets/icons/cross.svg";
 import SearchIcon from "@/assets/icons/search.svg";
 import SpinnerIcon from "@/assets/icons/spinner.svg";
 import { Button } from "@/components/button";
@@ -50,7 +50,7 @@ export const SearchInput: FC<SearchInputProps> = ({
           <Button
             type="reset"
             variant="plain"
-            icon={CloseIcon}
+            icon={CrossIcon}
             iconPosition="right"
             onClick={() => {
               submitSearch?.("");
diff --git a/features/search/search-page-selector/index.tsx b/features/search/search-page-selector/index.tsx
index b17eaeeee..cddd40a60 100644
--- a/features/search/search-page-selector/index.tsx
+++ b/features/search/search-page-selector/index.tsx
@@ -24,8 +24,9 @@ interface SearchTabsProps {
  */
 const SEARCH_TABS = [
   { path: "/datasets", translationKey: "search$datasets" },
-  { path: "/concepts", translationKey: "search$concepts" },
   { path: "/specifications", translationKey: "search$specifications" },
+  { path: "/concepts", translationKey: "search$concepts" },
+  { path: "/organisations", translationKey: "search$organisations" },
   { path: "/search", translationKey: "search$content" },
 ] as const;
 
@@ -45,21 +46,19 @@ export function SearchPageSelector({ query }: SearchTabsProps) {
   return (
     <nav aria-label={t("search$search-type-navigation")}>
       <div
-        className="mb-lg flex gap-md overflow-x-scroll md:overflow-x-visible"
+        className="mb-lg flex flex-wrap gap-sm md:gap-md"
         role="tablist"
         aria-label={t("search$search-tabs")}
       >
         {SEARCH_TABS.map(({ path, translationKey }) => (
           <ButtonLink
             key={path}
-            variant="plain"
+            variant="light"
             href={`${path}?q=${query || ""}&f=`}
             label={t(translationKey)}
             locale={lang}
-            className={`focus--in whitespace-nowrap ${
-              pathname === path
-                ? "bg-pink-200 font-strong text-textPrimary"
-                : ""
+            className={`button--large focus--in whitespace-nowrap rounded-t-md ${
+              pathname === path ? "active" : ""
             }`}
             role="tab"
             aria-selected={pathname === path}
diff --git a/features/search/search-page/search-page-content/index.tsx b/features/search/search-page/search-page-content/index.tsx
index a72599236..487b451fa 100644
--- a/features/search/search-page/search-page-content/index.tsx
+++ b/features/search/search-page/search-page-content/index.tsx
@@ -206,9 +206,9 @@ export const SearchPageContent: FC<SearchProps> = () => {
         <SearchPageSelector query={query} />
       </Container>
 
-      <div className="bg-white">
+      <div className="mt-xl bg-white py-xl">
         <Container>
-          <div id="search-result" className="my-lg py-xl md:my-xl">
+          <div id="search-result" className="my-lg">
             <div className="mb-lg md:mb-xl">
               <Heading level={2} size="md">
                 {loading && <span>{t("common|loading")}</span>}
diff --git a/features/search/search-page/search-page-entryscape/index.tsx b/features/search/search-page/search-page-entryscape/index.tsx
index 6141476c6..b3ac42b38 100644
--- a/features/search/search-page/search-page-entryscape/index.tsx
+++ b/features/search/search-page/search-page-entryscape/index.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
 import { FC, useContext, useEffect, useState, useMemo } from "react";
 
-import ChevronDownIcon from "@/assets/icons/chevronDown.svg";
+import ChevronDownIcon from "@/assets/icons/chevron-down.svg";
 import { Button } from "@/components/button";
 import { Container } from "@/components/layout/container";
 import { Heading } from "@/components/typography/heading";
@@ -20,7 +20,7 @@ import { createSearchProviderSettings } from "./search-page-provider-settings";
 
 interface SearchProps {
   activeLink?: string;
-  searchType: "datasets" | "concepts" | "specifications";
+  searchType: "datasets" | "concepts" | "specifications" | "organisations";
 }
 
 export const SearchPageEntryscape: FC<SearchProps> = ({ searchType }) => {
@@ -140,7 +140,7 @@ export const SearchPageEntryscape: FC<SearchProps> = ({ searchType }) => {
               </Container>
 
               <noscript>{t("common|no-js-text")}</noscript>
-              <div className="bg-white">
+              <div className="mt-xl bg-white py-xl">
                 <Container>
                   <div
                     className={
@@ -152,7 +152,7 @@ export const SearchPageEntryscape: FC<SearchProps> = ({ searchType }) => {
                     <SearchResults
                       showSorting={showFilter}
                       search={search}
-                      searchMode="datasets"
+                      searchMode={searchType}
                     />
                   </div>
                 </Container>
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 a8a334f29..71181d446 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
@@ -34,6 +34,11 @@ interface SearchProviderConfig {
     language: string;
     takeFacets: number;
     sortOrder?: SearchSortOrder;
+    filters?: {
+      key: string;
+      property: ESType;
+      values: string[];
+    }[];
   };
 }
 interface ResourceMeta {
@@ -231,6 +236,62 @@ export function createSearchProviderSettings(env: EnvSettings, lang: string) {
         takeFacets: 30,
       },
     },
+    organisations: {
+      entryscapeUrl: env.ENTRYSCAPE_DATASETS_PATH
+        ? `https://${env.ENTRYSCAPE_DATASETS_PATH}/store`
+        : "https://admin.dataportal.se/store",
+      hitSpecifications: {
+        "http://xmlns.com/foaf/0.1/Agent": {
+          path: `/organisations/`,
+          titleResource: "foaf:name",
+          descriptionResource: "dcterms:description",
+        },
+      },
+      facetSpecification: {
+        facets: [
+          {
+            resource: "http://purl.org/dc/terms/type",
+            dcatProperty: "dcterms:type",
+            dcatId: "adms:publishertype",
+            type: ESType.uri,
+            dcatType: "choice",
+            indexOrder: 1,
+            maschineName: "publishertype",
+            group: "actor",
+          },
+          {
+            resource: "http://xmlns.com/foaf/0.1/name",
+            dcatProperty: "foaf:name",
+            type: ESType.literal,
+            indexOrder: 2,
+            group: "actor",
+          },
+        ],
+      },
+      initRequest: {
+        esRdfTypes: [ESRdfType.agent],
+        language: lang,
+        takeFacets: 30,
+        filters: [
+          {
+            key: "dcterms:type",
+            property: "uri",
+            values: [
+              "http://purl.org/adms/publishertype/Academia-ScientificOrganisation",
+              "http://purl.org/adms/publishertype/Company",
+              "http://purl.org/adms/publishertype/IndustryConsortium",
+              "http://purl.org/adms/publishertype/LocalAuthority",
+              "http://purl.org/adms/publishertype/NationalAuthority",
+              "http://purl.org/adms/publishertype/NonGovernmentalOrganisation",
+              "http://purl.org/adms/publishertype/Non-ProfitOrganisation",
+              "http://purl.org/adms/publishertype/RegionalAuthority",
+              "http://purl.org/adms/publishertype/StandardisationBody",
+              "http://purl.org/adms/publishertype/SupraNationalAuthority",
+            ],
+          },
+        ],
+      },
+    },
     concepts: {
       entryscapeUrl: env.ENTRYSCAPE_TERMS_PATH
         ? `https://${env.ENTRYSCAPE_TERMS_PATH}/store`
diff --git a/features/search/search-results/index.tsx b/features/search/search-results/index.tsx
index b0b593788..ed222e88d 100644
--- a/features/search/search-results/index.tsx
+++ b/features/search/search-results/index.tsx
@@ -1,12 +1,18 @@
 import Link from "next/link";
 import useTranslation from "next-translate/useTranslation";
-import { useEffect, useState, FC, Dispatch, SetStateAction } from "react";
+import {
+  useEffect,
+  useState,
+  FC,
+  Dispatch,
+  SetStateAction,
+  useContext,
+} from "react";
 
 import ListIcon from "@/assets/icons/list.svg";
 import DetailedListIcon from "@/assets/icons/listDetailed.svg";
 import { Button } from "@/components/button";
 import { FileFormatBadge } from "@/components/file-format-badge";
-import { Select } from "@/components/form/select";
 import { Pagination } from "@/components/pagination";
 import { Heading } from "@/components/typography/heading";
 import { SearchMode } from "@/features/search/search-filters";
@@ -14,8 +20,11 @@ import {
   SearchSortOrder,
   SearchContextData,
 } from "@/providers/search-provider";
+import { SettingsContext } from "@/providers/settings-provider";
 import { SearchHit } from "@/types/search";
 
+import { SearchSelectFilter } from "../search-filters/search-select-filter";
+
 interface SearchResultsProps {
   search: SearchContextData;
   searchMode: SearchMode;
@@ -67,9 +76,10 @@ const SortingOptions: FC<{
   search: SearchContextData;
 }> = ({ search, setCompact, isCompact }) => {
   const { t } = useTranslation();
+  const { iconSize } = useContext(SettingsContext);
 
   return (
-    <div className="mb-lg flex flex-wrap items-center gap-md md:mb-none">
+    <div className="mb-lg flex flex-wrap items-center justify-between gap-md md:mb-none">
       <Button
         size="sm"
         variant="plain"
@@ -95,68 +105,12 @@ const SortingOptions: FC<{
         }
       />
 
-      <Select
-        id="sort"
-        label={t("pages|search$sort")}
-        value={search.request.sortOrder}
-        onChange={(event) => {
-          event.preventDefault();
-          clearCurrentScrollPos();
-          search
-            .set({
-              page: 0,
-              sortOrder: parseInt(event.target.value),
-            })
-            .then(() => search.doSearch());
-        }}
-      >
-        <option
-          aria-selected={search.request.sortOrder == SearchSortOrder.score_desc}
-          value={SearchSortOrder.score_desc}
-        >
-          {t("pages|search$relevance")}
-        </option>
-
-        <option
-          aria-selected={
-            search.request.sortOrder == SearchSortOrder.modified_desc
-          }
-          value={SearchSortOrder.modified_desc}
-        >
-          {t("pages|search$date")}
-        </option>
-      </Select>
-
-      <Select
-        id="hits"
-        label={t("pages|search$numberofhits")}
-        value={search.request.take}
-        onChange={(event) => {
-          event?.preventDefault();
-          clearCurrentScrollPos();
-          search
-            .set({
-              take: parseInt(event.target.value),
-            })
-            .then(() => search.doSearch());
-        }}
-      >
-        <option aria-selected={search.request.take == 20} value="20">
-          {t("pages|search$numberofhits-20")}
-        </option>
-        <option aria-selected={search.request.take == 50} value="50">
-          {t("pages|search$numberofhits-50")}
-        </option>
-        <option aria-selected={search.request.take == 100} value="100">
-          {t("pages|search$numberofhits-100")}
-        </option>
-      </Select>
-
       {/* For mobile only */}
       <Button
         size="sm"
         variant="plain"
-        className="md:hidden"
+        iconSize={iconSize * 1.5}
+        className="px-none md:hidden"
         icon={isCompact ? ListIcon : DetailedListIcon}
         iconPosition="left"
         aria-label={
@@ -164,6 +118,7 @@ const SortingOptions: FC<{
             ? t("pages|search$detailed-list-active")
             : t("pages|search$detailed-list")
         }
+        label={t("pages|search$list")}
         onClick={() => {
           clearCurrentScrollPos();
           search.set({ compact: isCompact }).then(() => {
@@ -172,6 +127,52 @@ const SortingOptions: FC<{
           });
         }}
       />
+
+      <div className="flex items-center gap-md">
+        <SearchSelectFilter
+          id="sort"
+          label={t("pages|search$sort")}
+          value={search.request.sortOrder?.toString()}
+          options={[
+            {
+              value: SearchSortOrder.score_desc.toString(),
+              label: t("pages|search$relevance"),
+            },
+            {
+              value: SearchSortOrder.modified_desc.toString(),
+              label: t("pages|search$date"),
+            },
+          ]}
+          onChange={(event) => {
+            clearCurrentScrollPos();
+            search
+              .set({
+                page: 0,
+                sortOrder: parseInt(event.target.value),
+              })
+              .then(() => search.doSearch());
+          }}
+        />
+
+        <SearchSelectFilter
+          id="hits"
+          label={t("pages|search$numberofhits")}
+          value={search.request.take?.toString()}
+          options={[
+            { value: "20", label: t("pages|search$numberofhits-20") },
+            { value: "50", label: t("pages|search$numberofhits-50") },
+            { value: "100", label: t("pages|search$numberofhits-100") },
+          ]}
+          onChange={(event) => {
+            clearCurrentScrollPos();
+            search
+              .set({
+                take: parseInt(event.target.value),
+              })
+              .then(() => search.doSearch());
+          }}
+        />
+      </div>
     </div>
   );
 };
@@ -249,17 +250,24 @@ export const SearchResults: FC<SearchResultsProps> = ({
     <div className="animate-pulse space-y-lg opacity-50">
       <div className="rounded h-lg w-1/4 bg-green-600" />
       <div className="flex flex-col gap-sm">
+        <div className="rounded my-xs h-sm w-1/3 bg-textSecondary" />
         <div className="rounded h-md w-3/4 bg-textPrimary" />
         <div className="rounded h-md w-3/4 bg-textPrimary" />
-        <div className="rounded h-sm w-2/4 bg-textSecondary" />
+        {searchMode === "datasets" && (
+          <div className="rounded h-sm w-2/4 bg-textSecondary" />
+        )}
       </div>
     </div>
   );
 
   return (
-    <div id="search-result" className="my-lg py-xl md:my-xl">
-      <div className="mb-lg flex flex-col-reverse justify-between md:flex-row">
-        <Heading level={2} size="md" className="search-result-header">
+    <div id="search-result" className="md:my-lg">
+      <div className="mb-lg flex flex-col justify-between md:flex-row">
+        <Heading
+          level={2}
+          size="md"
+          className="search-result-header mb-md text-xl"
+        >
           {/* Visual display of the count */}
           <span aria-hidden="true">
             {search.loadingHits && `${t("common|loading")}...`}
@@ -274,7 +282,7 @@ export const SearchResults: FC<SearchResultsProps> = ({
           </div>
         </Heading>
 
-        {searchMode == "datasets" && (
+        {searchMode !== "content" && (
           <SortingOptions
             setCompact={setCompact}
             isCompact={isCompact}
@@ -316,17 +324,26 @@ export const SearchResults: FC<SearchResultsProps> = ({
                     !search.loadingFacets &&
                     hit.metadata["inScheme_resource"] &&
                     hit.metadata["inScheme_resource"][0] !== "" && (
-                      <span className="inScheme_resource">
+                      <span className="inScheme_resource text-sm font-strong text-textSecondary">
                         {hit.metadata["inScheme_resource"][0]}
                       </span>
                     )}
 
                   {hit.metadata && hit.metadata["organisation_literal"] && (
-                    <span className="organisation break-words text-sm font-strong text-textSecondary">
+                    <span className="break-words text-sm font-strong text-textSecondary">
                       {hit.metadata["organisation_literal"]}
                     </span>
                   )}
 
+                  {hit.metadata && hit.metadata["organisation_type"] && (
+                    <span className="text-sm text-textSecondary">
+                      {"Typ: "}
+                      <span className="break-words font-strong">
+                        {hit.metadata["organisation_type"]}
+                      </span>
+                    </span>
+                  )}
+
                   {isCompact && hit.descriptionLang && (
                     <p className="mb-xs line-clamp-4 break-words md:line-clamp-2">
                       {hit.description}
@@ -342,13 +359,14 @@ export const SearchResults: FC<SearchResultsProps> = ({
                   >
                     <div className="mb-xs text-sm font-strong text-textSecondary">
                       {hit.metadata &&
+                        hit.metadata["theme_literal"] &&
                         hit.metadata["theme_literal"].length > 0 && (
                           <span className="category">
                             {hit.metadata["theme_literal"].join(",  ")}
                           </span>
                         )}
                     </div>
-                    <div className="formats space-x-md">
+                    <div className="formats flex w-full flex-wrap gap-md">
                       {hit.metadata &&
                         hit.metadata["format_literal"] &&
                         hit.metadata["format_literal"].map(
diff --git a/features/statistic/index.tsx b/features/statistic/index.tsx
index 6cfd29b78..62606a4d2 100644
--- a/features/statistic/index.tsx
+++ b/features/statistic/index.tsx
@@ -123,7 +123,7 @@ export const Statistic: FC = () => {
     <>
       <div className="block bg-white p-xl">
         <Heading level={3} size="sm" className="mb-lg">
-          {t("statistic$top-organizations")}
+          {t("statistic$top-organisations")}
         </Heading>
 
         <ol key={"toplist-organisation"} className="list-decimal pl-lg">
diff --git a/features/statistic/statistic-numbers/index.tsx b/features/statistic/statistic-numbers/index.tsx
index f86048476..5b5725548 100644
--- a/features/statistic/statistic-numbers/index.tsx
+++ b/features/statistic/statistic-numbers/index.tsx
@@ -71,7 +71,7 @@ export const StatisticNumbers = () => {
         dataNumber={state.datasetCount}
       />
       <StatisticDataPresentation
-        dataText={t("search$organization")}
+        dataText={t("search$organisations")}
         dataNumber={state.publisherCount}
       />
     </div>
diff --git a/locales/en/common.json b/locales/en/common.json
index b7347ec92..7e2a1a09c 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -1,108 +1,108 @@
 {
-  "accessibility-report": "Accessibility report",
   "about": "About",
+  "accessibility-report": "Accessibility report",
+  "active-filters": "Active filters",
+  "all-concepts": "All concepts",
+  "all-data-api": "All Data & APIs",
+  "all-specs": "All specifications",
   "available-filters": "Available filters",
-  "filter-options": "Filter options",
   "beta": "BETA",
-  "datasets": "Datasets",
-  "beta-text1": "We are constantly developing Sveriges dataportal. Please send your ",
   "beta-link-text": "opinions",
+  "beta-text1": "We are constantly developing Sveriges dataportal. Please send your ",
   "beta-text2": " to us!",
   "breadcrumb": "Breadcrumbs",
   "change-lang": "sv",
-  "clear-search": "Clear search field",
   "clear-filters": "Clear filters",
-  "close-filter": "Close filter list",
-  "open-filter": "Open filter list",
+  "clear-search": "Clear search field",
   "close": "Close",
-  "concepts": "Concepts",
+  "close-filter": "Close filter",
   "close_menu": "Menu",
   "close_search": "Search",
-  "contact": "Contact",
-  "cookies": "cookies",
   "code-block": "Code block",
-  "terminologies": "Terminologies",
-  "term-with-concept": "Terminology with concept",
-  "copy-code": "Copy code",
   "code-copied-successfully": "Code copied successfully",
   "code-copy-failed": "Failed to copy code",
+  "community": "Community",
+  "concepts": "Concepts",
+  "contact": "Contact",
   "content-menu-heading": "Page content",
+  "cookie-settings": "Cookie settings",
+  "cookies": "cookies",
+  "copy-code": "Copy code",
+  "data-areas": "Data areas",
+  "dataportal": "The Swedish dataportal",
+  "datasets": "Datasets",
   "digg-logo_text": "DIGG - Agency for digital government",
+  "digg-managed_text": "DIGG is managed by the Swedish Agency for Digital Government",
+  "documentation-services": "Documentation och services - Sweden's dataportal",
   "email_link": "Opens email",
-  "external_link": "Leads to external website",
   "exploreapi": "Explore API",
+  "external_link": "Leads to external website",
+  "feedback": "Feedback on dataportal.se",
   "filter": "Filters",
-  "active-filters": "Active filters",
+  "filter-options": "Filter options",
   "filter-text": "The page updates automatically when you apply filters",
+  "github": "Open source on GitHub",
+  "go-to": "Navigate to",
+  "guidance-share": "Guidance for open and shared data (in Swedish)",
   "hide-filter": "Hide filter",
+  "high-value-dataset": "High-value dataset",
   "home-text": "Home",
   "illustration-1": "Illustration av kommunikation mellan dator och mobil",
   "illustration-2": "Illustration av ett hus",
   "illustration-3": "Illustration av dator som tar emot data",
   "lang-linktext": "Svenska",
+  "lang-path": "/en",
+  "load-more": "Load more",
+  "loading": "Loading",
   "logo": "Sveriges Dataportal",
-  "logo-title": "To startpage",
   "logo-alt-title": "Sveriges Dataportal, to startpage",
-  "loading": "Loading",
-  "load-more": "Load more",
   "logo-text": " - Agency for digital government",
+  "logo-title": "To startpage",
+  "managed-and-developed-by": "is managed and developed by ",
   "menu": "Menu",
+  "menu-anchor": "On-page navigation",
+  "menu-close": "Open menu",
+  "menu-container": "Section navigation",
   "menu-footer": "Footer links",
+  "menu-form": "Form steps",
+  "menu-form-bottom": "Form actions",
   "menu-main": "Main site navigation",
-  "menu-submenu": "Submenu",
   "menu-open": "Close menu",
-  "menu-close": "Open menu",
   "menu-service": "Site utilities",
-  "menu-container": "Section navigation",
   "menu-sidebar": "Full site navigation",
-  "menu-anchor": "On-page navigation",
-  "menu-form": "Form steps",
-  "menu-form-bottom": "Form actions",
+  "menu-submenu": "Submenu",
   "national-dataset": "National basic data",
+  "no": "No",
   "no-js-text": "JavaScript must be enabled for the search page to work.",
   "of": "of",
-  "to": "to",
-  "all-data-api": "All Data & APIs",
-  "all-concepts": "All concepts",
-  "all-specs": "All specifications",
+  "open": "Open",
+  "open-filter": "Open filter list",
+  "open-in-email": "Opens in email",
+  "open-in-new-tab": "Opens in new tab",
+  "preview": "Preview",
+  "published-date": "Published date",
+  "read-more": "Read more",
   "search": "Search",
-  "search-data": "Search data",
   "search-api": "Data & APIs",
-  "search-dataapi": "Search data & APIs",
   "search-concept": "Search concepts",
-  "search-specs": "Search specifications",
   "search-content": "Search content",
-  "specifications": "Specifications",
-  "support-tools": "Tools and support",
-  "preview": "Preview",
-  "show-filter": "Show filter",
-  "soon": "COMING SOON",
+  "search-data": "Search data",
+  "search-dataapi": "Search data & APIs",
+  "search-specs": "Search specifications",
+  "self-assessment-tools": "Self-assessment tools",
   "seo-title": "Sveriges Dataportal",
+  "show-filter": "Show filter",
   "skiptocontent": "Skip to content",
-  "to-top": "To the top",
+  "soon": "COMING SOON",
+  "specifications": "Specifications",
+  "support-tools": "Tools and support",
+  "term-with-concept": "Terminology with concept",
+  "terminologies": "Terminologies",
+  "to": "to",
   "to-page": "To the page",
+  "to-top": "To the top",
+  "toolbox-share-data": "Toolbox for sharing data",
   "top-image": "View of Stockholm",
-  "digg-managed_text": "DIGG is managed by the Swedish Agency for Digital Government",
-  "data-areas": "Data areas",
-  "yes": "Yes",
-  "no": "No",
-  "go-to": "Navigate to",
-  "open": "Open",
-  "open-in-new-tab": "Opens in new tab",
-  "open-in-email": "Opens in email",
-  "self-assessment-tools": "Self-assessment tools",
   "training": "Training for managers and leaders",
-  "lang-path": "/en",
-  "dataportal": "The Swedish dataportal",
-  "github": "Open source on GitHub",
-  "cookie-settings": "Cookie settings",
-  "feedback": "Feedback on dataportal.se",
-  "toolbox-share-data": "Toolbox for sharing data",
-  "documentation-services": "Documentation och services - Sweden's dataportal",
-  "guidance-share": "Guidance for open and shared data (in Swedish)",
-  "community": "Community",
-  "read-more": "Read more",
-  "published-date": "Published date",
-  "high-value-dataset": "High-value dataset",
-  "managed-and-developed-by": "is managed and developed by "
+  "yes": "Yes"
 }
diff --git a/locales/en/filters.json b/locales/en/filters.json
index 530674bde..72ce8d991 100644
--- a/locales/en/filters.json
+++ b/locales/en/filters.json
@@ -2,11 +2,12 @@
   "allchecktext": {
     "http://purl.org/dc/terms/license": "All with license"
   },
-  "theme-input-label": "Search within filters",
   "group": {
     "access": "Availability",
-    "type": "Type of data",
     "actor": "Actors",
-    "distribution": "Distribution"
-  }
+    "distribution": "Distribution",
+    "share": "Share",
+    "type": "Type of data"
+  },
+  "theme-input-label": "Search within filters"
 }
diff --git a/locales/en/pages.json b/locales/en/pages.json
index fdebead85..5efe349b3 100644
--- a/locales/en/pages.json
+++ b/locales/en/pages.json
@@ -1,9 +1,9 @@
 {
   "ai": {
     "heading": "Public AI",
-    "preamble": "",
     "model": "",
-    "model_description": ""
+    "model_description": "",
+    "preamble": ""
   },
   "concept_page": {
     "about_concept": "About concept",
@@ -13,11 +13,11 @@
     "concept_adress": "Address for concept",
     "download_concept": "Download",
     "editorial_note": "Editorial note",
-    "example": "Example",
     "exact_match": "Has exact match",
+    "example": "Example",
     "first_level_concepts": "Concepts in the first level of terminology",
-    "historical_note": "Historical note",
     "hidden_term": "Hidden term",
+    "historical_note": "Historical note",
     "no_related_concepts": "No related concepts",
     "no_subordinate_concepts": "No subordinate concepts",
     "no_superior_concept": "No superior concepts",
@@ -30,8 +30,8 @@
     "subordinate_match": "Has subordinate match",
     "superior_concept": "Superior concept",
     "superior_match": "Has superior match",
-    "terminology_concept": "Terminology",
     "term_adress": "Address for terminology",
+    "terminology_concept": "Terminology",
     "visualization_concepts": "Visualization of subordinate concepts"
   },
   "concepts": {
@@ -51,222 +51,229 @@
     "heading": "Data & APIs",
     "preamble": "Data is a national resource for the development of society, industry and the public sector. It is a path to transparency, innovation and growth that benefits the entire society created by citizens, businesses and the government bodies together."
   },
+  "dataservicepage": {
+    "api": "About API"
+  },
   "datasetpage": {
-    "explore-api": "Explore API",
     "about-dataset": "About dataset",
-    "download-dataset": "Access data",
     "catalog": "Catalog",
-    "use-data": "Use data",
-    "download_link_adress": "Access URL",
-    "download_link": "Download data",
-    "several_links": "The data has several links for download",
-    "several_links_header": "The data resource consists of the following files",
-    "no_title": "No title given",
-    "no_data": "This data set has no data resources",
-    "read_about_api": "Read more about API",
-    "fileformat": "other file format",
-    "rdf": "Download metadata as RDF",
-    "view_more": "View more",
-    "related_specifications": "Specification",
-    "view_less": "View less",
-    "dataservice": "Dataservice",
-    "keyword": "Keywords",
     "category": "Categories",
     "contact-publisher": "Do you have questions or comments?",
-    "contact-publisher-text": "Contact the publishing organization for questions, comments and requests regarding the information on this page. ",
+    "contact-publisher-text": "Contact the publishing organisation for questions, comments and requests regarding the information on this page. ",
     "contact-publisher-text2": "You can also go to the data portal ",
+    "dataservice": "Dataservice",
+    "download-dataset": "Access data",
+    "download-metadata-as": "Download metadata as",
+    "download_link": "Download data",
+    "download_link_adress": "Access URL",
+    "explore-api": "Explore API",
+    "fileformat": "other file format",
+    "keyword": "Keywords",
     "mqa": "Metadata quality",
     "mqa-catalog": "Metadata quality catalog",
-    "download-metadata-as": "Download metadata as"
+    "no_data": "This data set has no data resources",
+    "no_title": "No title given",
+    "rdf": "Download metadata as RDF",
+    "read_about_api": "Read more about API",
+    "related_specifications": "Specification",
+    "several_links": "The data has several links for download",
+    "several_links_header": "The data resource consists of the following files",
+    "use-data": "Use data",
+    "view_less": "View less",
+    "view_more": "View more"
   },
   "datasets": {
-    "search": "Search",
     "datasets": "datasets",
-    "social_meta_title": "Search datasets",
-    "social_meta_description": "Datasets on Sweden's data portal"
-  },
-  "dataservicepage": {
-    "api": "About API"
+    "search": "Search",
+    "social_meta_description": "Datasets on Sweden's data portal",
+    "social_meta_title": "Search datasets"
   },
   "explore-api-page": {
-    "explore-api": "Explore API",
-    "belongs-to-dataset": "Refers to dataset",
     "access-to-api": "Access to API",
     "access-to-api-txt": "The data portal provides both APIs that are fully open and those that require an API key.",
-    "open-apis": "Open APIs",
-    "open-apis-txt": "If the API is open you are able to directly make API calls and explore the data.",
+    "api-contract": "API Contract",
     "api-key": "APIs that require an API key",
     "api-key-txt": "There are APIs that need to be unlocked with an API key to enable you to make calls and explore the amount of data. To get access to an API key you need to contact the publisher. ",
+    "belongs-to-dataset": "Refers to dataset",
     "contact-publisher": "Contact to publisher",
-    "api-contract": "API Contract"
+    "explore-api": "Explore API",
+    "open-apis": "Open APIs",
+    "open-apis-txt": "If the API is open you are able to directly make API calls and explore the data."
   },
   "form": {
-    "placeholder-text": "Enter your answer here",
     "clear-all-text": "Clear form",
     "clear-confirm-text": "Are you sure you want to clear the form?",
-    "upload-json-file": "Upload JSON-file",
+    "form-continue-text": "Do you wish to continue to the next step?",
+    "generate-pdf-text": "Generate PDF",
+    "go-back-text": "Back",
     "next-section-text": "Next section",
+    "placeholder-text": "Enter your answer here",
     "previous-section-text": "Previous section",
     "save-form": "Save",
-    "generate-pdf-text": "Generate PDF",
-    "form-continue-text": "Do you wish to continue to the next step?",
     "start-evaluation-text": "Start evaluation",
-    "go-back-text": "Back"
+    "upload-json-file": "Upload JSON-file"
   },
   "good-examples": {
+    "social_meta_description": "Good examples on Sveriges Dataportal",
+    "social_meta_title": "Good examples - Sveriges Dataportal",
     "text": "good examples",
     "title": "Latest examples",
-    "view-all": "View all examples",
-    "social_meta_title": "Good examples - Sveriges Dataportal",
-    "social_meta_description": "Good examples on Sveriges Dataportal"
+    "view-all": "View all examples"
   },
   "highlight": {
     "highlight-header": "Sweden's data portal for increased innovation",
     "highlight-text": "Data is a national resource for the development of society, industry and the public sector. It is a path to transparency, innovation and growth that benefits the entire society created by citizens, businesses and the government bodies together.",
-    "highlight-text2": "Sweden’s data portal is a hub that coordinates and makes available data for re-use provided by public, private and civil society organisations. The portal only contains information about the datasets. Data is retrieved or requested via links to the organization responsible for it."
+    "highlight-text2": "Sweden’s data portal is a hub that coordinates and makes available data for re-use provided by public, private and civil society organisations. The portal only contains information about the datasets. Data is retrieved or requested via links to the organisation responsible for it."
   },
   "listpage": {
-    "no-content": "There is no content to display at the moment",
-    "fallback-tag": "News"
+    "fallback-tag": "News",
+    "no-content": "There is no content to display at the moment"
   },
   "notfoundpage": {
-    "heading": "404 - Page not found",
     "body": "The page you requested could not be found. Hopefully one of these links can help you find the information.",
-    "startpage": "Home page",
-    "search-data": "Search data"
+    "heading": "404 - Page not found",
+    "search-data": "Search data",
+    "startpage": "Home page"
   },
   "organisation_page": {
-    "org-type": "Organisation type",
-    "org-no": "Organisation number",
-    "download_link": "Download metadata",
     "all-data": "Total datasets",
-    "view-all-data": "View all datasets",
-    "view-all-spec": "View all specifications",
-    "open-data": "Open datasets",
-    "protected-data": "Protected datasets",
     "api-data": "Datasets with API",
-    "hvd-data": "High value datasets",
-    "fee-data": "Fee-based datasets",
-    "spec-data": "Datasets that follow specifications",
     "contact": "Contact",
-    "view-all-concepts": "View all concepts",
     "data-info": "Information about the datasets",
+    "data-info-more": "Lorem ipsum dolor sit amet consectetur. Vitae aenean integer rhoncus enim urna. Eget eu semper ridiculus adipiscing ante enim. Adipiscing id ut sed sed sagittis faucibus nisl. Mi sem praesent id tempus vitae sagittis amet. Et ornare a duis sit odio scelerisque. Sed enim dolor massa dignissim ut. Platea quis proin purus auctor cursus semper dictum ultrices arcu.",
+    "download_link": "Download metadata",
+    "fee-data": "Fee-based datasets",
+    "hvd-data": "High value datasets",
     "no-contact": "No contact information has been provided",
     "no-org-type": "No organisation type has been provided",
-    "data-info-more": "Lorem ipsum dolor sit amet consectetur. Vitae aenean integer rhoncus enim urna. Eget eu semper ridiculus adipiscing ante enim. Adipiscing id ut sed sed sagittis faucibus nisl. Mi sem praesent id tempus vitae sagittis amet. Et ornare a duis sit odio scelerisque. Sed enim dolor massa dignissim ut. Platea quis proin purus auctor cursus semper dictum ultrices arcu."
+    "open-data": "Open datasets",
+    "org-no": "Organisation number",
+    "org-type": "Organisation type",
+    "protected-data": "Protected datasets",
+    "spec-data": "Datasets that follow specifications",
+    "view-all-concepts": "View all concepts",
+    "view-all-data": "View all datasets",
+    "view-all-spec": "View all specifications"
+  },
+  "organisations": {
+    "organisations": "organisations",
+    "search": "Search",
+    "social_meta_description": "Organisations on Sweden's data portal",
+    "social_meta_title": "Search organisations"
   },
   "os": {
     "heading": "Open Source",
     "preamble": "Open source significantly increases the pace of innovation as actors can co-develop, adapt and build on existing solutions."
   },
   "redirect": {
-    "pagenotfound_header": "Oops, the page could not be found!",
     "pagenotfound-label": "Sveriges Dataportal",
-    "pagenotfound-text": "This may be because oppnadata.se moved to dataportal.se September 23, 2020. Hopefully these links can help you find what you were looking for.",
     "pagenotfound-link": "Home page",
-    "pagenotfound-link2": "Search data"
+    "pagenotfound-link2": "Search data",
+    "pagenotfound-text": "This may be because oppnadata.se moved to dataportal.se September 23, 2020. Hopefully these links can help you find what you were looking for.",
+    "pagenotfound_header": "Oops, the page could not be found!"
   },
   "search": {
-    "search": "Search data",
-    "search-tabs": "Search tabs navigation",
-    "search-type-navigation": "Search type navigation",
-    "dataset-hits": "results ",
+    "compact-list": "Compact list",
+    "compact-list-active": "Compact list",
     "concept-hits": "results",
-    "specification-hits": "results",
-    "content-hits": "results",
-    "next-page": "Next",
-    "prev-page": "Previous",
-    "first-page": "First",
-    "showing": "Showing",
-    "results": "results",
-    "datasets": "Data & APIs",
     "concepts": "Concepts",
-    "specifications": "Specifications",
     "content": "Content",
-    "organization": "Organizations",
-    "relevance": "Relevance",
+    "content-hits": "results",
+    "dataset-hits": "results ",
+    "datasets": "Data & APIs",
     "date": "Last modified",
-    "sort": "Order by",
+    "detailed-list": "Detailed list",
+    "detailed-list-active": "Detailed list aktiv",
+    "filtersearch": "Search within filter",
+    "first-page": "First",
+    "less-filters": "View less filters",
+    "list": "List",
+    "list-view": "List view",
+    "more-filters": "View more filters",
+    "next-page": "Next",
     "nohits": "No hits",
     "numberofhits": "Number of hits",
+    "numberofhits-100": "100 hits",
     "numberofhits-20": "20 hits",
     "numberofhits-50": "50 hits",
-    "numberofhits-100": "100 hits",
-    "filtersearch": "Search within filter",
+    "organisations": "Organisations",
+    "pagination-next-txt": "Next",
+    "prev-page": "Previous",
+    "relevance": "Relevance",
+    "results": "results",
+    "search": "Search data",
+    "search-tabs": "Search tabs navigation",
     "search-tips": "Search tips",
-    "search-tips-search-head": "Expand search with asterisk (*)",
-    "search-tips-search-txt": "A search can be expanded by adding an asterisk (*) at the end of the search word. This allows the search to include different endings of the current search word.",
     "search-tips-filter-head": "Filtering",
     "search-tips-filter-txt": "Searching with different filters (e.g. categories and licenses) creates an AND between the filters. Searching with several options within a filter (e.g. several different formats) creates an OR between the options.",
+    "search-tips-license-head": "Licenses",
+    "search-tips-license-link": "licenses",
+    "search-tips-license-txt": "Licenses are rules for how data may be used, read more about",
+    "search-tips-search-head": "Expand search with asterisk (*)",
+    "search-tips-search-txt": "A search can be expanded by adding an asterisk (*) at the end of the search word. This allows the search to include different endings of the current search word.",
     "search-tips-searchfilter-head": "Search within filters",
-    "search-tips-searchfilter-txt": "Within the filters for category, organization and format, it is possible to perform a search, e.g. it is possible to search for a special authority or municipality within the filter for organization.",
+    "search-tips-searchfilter-txt": "Within the filters for category, organisation and format, it is possible to perform a search, e.g. it is possible to search for a special authority or municipality within the filter for organisation.",
     "search-tips-sort-head": "Sorting",
     "search-tips-sort-txt1": "When sorting the search result by",
     "search-tips-sort-txt2": "Relevance",
     "search-tips-sort-txt3": ", the search term is matched by heading. When sorting by",
     "search-tips-sort-txt4": "Last modified",
     "search-tips-sort-txt5": ", the most recently updated metadata (information about the data) is displayed first. The fact that the metadata is updated does to mean that the actual data is updated.",
-    "search-tips-license-head": "Licenses",
-    "search-tips-license-txt": "Licenses are rules for how data may be used, read more about",
-    "search-tips-license-link": "licenses",
-    "list-view": "List view",
-    "more-filters": "View more filters",
-    "less-filters": "View less filters",
-    "detailed-list": "Detailed list",
-    "detailed-list-active": "Detailed list aktiv",
-    "compact-list": "Compact list",
-    "compact-list-active": "Compact list",
-    "pagination-next-txt": "Next"
+    "search-type-navigation": "Search type navigation",
+    "showing": "Showing",
+    "sort": "Order by",
+    "specification-hits": "results",
+    "specifications": "Specifications"
   },
   "specification_page": {
-    "address": "Adress för specifikation",
     "about_specification": "About specification",
-    "resource_specification": "Resource",
-    "scheme_download": "Download schema",
+    "address": "Adress för specifikation",
+    "download": "Download",
     "guidance_download": "Download guidance",
-    "specification_download": "Access URL",
     "related_datasets": "Related datasets",
-    "download": "Download"
+    "resource_specification": "Resource",
+    "scheme_download": "Download schema",
+    "specification_download": "Access URL"
   },
   "specifications": {
     "search": "Search",
-    "specifications": "specifications",
+    "social_meta_description": "Specifications on Sweden's data portal",
     "social_meta_title": "Search specifications",
-    "social_meta_description": "Specifications on Sweden's data portal"
+    "specifications": "specifications"
   },
   "startpage": {
+    "data-api-header": "Data & APIs",
+    "datasets_by_category": "Data by categories",
+    "explore_concepts": "Explore concepts and terminologies",
+    "explore_datasets": "Explore datasets and APIs",
+    "explore_specs": "Explore specifications of information and data models",
+    "good-examples": "Good examples",
     "heading": "Sveriges Dataportal",
+    "news": "News",
+    "open-source-header": "Open Source",
     "preamble": "Sveriges Dataportal is for those of you who have data to share, for those of you who already are involved in data driven development and innovation, as well as for those of you who have just begun to think about how the combined power of our data can move society forward.",
+    "public-ai-header": "Public AI",
+    "search_datasets_format": "Search datasets in the {{category}} category",
     "search_placeholder": "Search datasets and APIs",
+    "search_title_1": "Search and explore data from Sweden",
     "seo_description": "Sweden's national data portal for finding, exploring and using data from the public and private sectors",
     "seo_title": "Sveriges Dataportal",
-    "search_title_1": "Search and explore data from Sweden",
-    "explore_datasets": "Explore datasets and APIs",
-    "explore_concepts": "Explore concepts and terminologies",
-    "explore_specs": "Explore specifications of information and data models",
-    "search_datasets_format": "Search datasets in the {{category}} category",
-    "datasets_by_category": "Data by categories",
-    "social_meta_title": "Sveriges Dataportal",
     "social_meta_description": "Sveriges Dataportal for finding, exploring and using data from the public and private sectors",
-    "data-api-header": "Data & APIs",
-    "open-source-header": "Open Source",
-    "public-ai-header": "Public AI",
-    "news": "News",
-    "good-examples": "Good examples"
+    "social_meta_title": "Sveriges Dataportal"
   },
   "statistic": {
-    "statistic-header": "Statistics of the data portal",
     "dataset-numbers": "Data per month",
-    "statistic-numbers": "Statistics at a glance",
-    "top-organizations": "Organizations with the most datasets",
-    "top-categories": "Categories with the most datasets",
+    "social_meta_description": "The following information is also avaliable in text.",
+    "social_meta_title": "Statistics of the data portal",
+    "statistic-header": "Statistics of the data portal",
     "statistic-link": "Description of statistics",
-    "statistic-page-text": "Statistics visualized on the startpage is here available in text. The statistics shows the amount of data on Sweden´s dataportal per month, top 5 organizations and categories.",
+    "statistic-numbers": "Statistics at a glance",
     "statistic-page-header": "Statistics",
+    "statistic-page-link": "statistics",
     "statistic-page-numberofdatasets": "The amount of data on Sweden´s dataportal today: ",
     "statistic-page-seotitle": "Statistics - Sveriges dataportal",
-    "statistic-page-link": "statistics",
-    "social_meta_title": "Statistics of the data portal",
-    "social_meta_description": "The following information is also avaliable in text."
+    "statistic-page-text": "Statistics visualized on the startpage is here available in text. The statistics shows the amount of data on Sweden´s dataportal per month, top 5 organisations and categories.",
+    "top-categories": "Categories with the most datasets",
+    "top-organisations": "Organisations with the most datasets"
   }
 }
diff --git a/locales/en/resources.json b/locales/en/resources.json
index 61b589bf6..11b064c60 100644
--- a/locales/en/resources.json
+++ b/locales/en/resources.json
@@ -1,46 +1,6 @@
 {
-  "http://purl.org/dc/terms/publisher": "Organization",
-  "http://www.w3.org/ns/dcat#theme": "Theme",
-  "http://purl.org/dc/terms/type": "Organization type",
-  "http://purl.org/dc/terms/format": "Format",
-  "http://purl.org/dc/terms/accessRights": "Access",
-  "http://purl.org/dc/terms/license": "License",
+  "api": "API/Data service",
   "http://data.europa.eu/r5r/applicableLegislation": "High-value dataset",
-  "http://purl.org/dc/terms/subject": "National basic data",
-
-  "https://dataportal.se/concepts/licensecategories/otherlicense": "Other licenses",
-  "https://dataportal.se/concepts/licensecategories/nolicense": "License missing",
-  "http://creativecommons.org/publicdomain/zero/1.0/": "CC0",
-  "https://creativecommons.org/licenses/by/4.0/deed.sv": "CC BY",
-  "http://creativecommons.org/licenses/by/4.0/": "CC BY",
-  "http://creativecommons.org/licenses/by-sa/4.0/": "CC BY-SA",
-  "http://creativecommons.org/licenses/by-nc-sa/4.0/": "CC BY-NC-SA",
-  "http://creativecommons.org/licenses/by-nd/4.0/": "CC BY-ND",
-  "http://creativecommons.org/licenses/by-nc/4.0/": "CC BY-NC",
-
-  "http://creativecommons.org/licenses/by-nc/3.0/": "CC BY-NC 3.0 Non commercial",
-  "https://creativecommons.org/publicdomain/zero/1.0/deed.sv": "CC0 1.0 universell",
-  "http://creativecommons.org/licenses/by/2.5/se/": "Erkännande 2.5 Sverige (CC BY 2.5 SE)",
-  "https://creativecommons.org/licenses/by/3.0//": "Attribution 3.0 Unported (CC BY 3.0)",
-  "http://creativecommons.org/licenses/by/2.5/se": "Erkännande 2.5 Sverige (CC BY 2.5 SE)",
-  "https://creativecommons.org/licenses/by-nd/4.0/deed.sv": "Erkännande-IngaBearbetningar 4.0 Internationell (CC BY-ND 4.0)",
-  "http://www.creativecommons.se/om-cc/licenserna/": "Om Creative Commons licens",
-  "https://opendatacommons.org/licenses/dbcl/1.0/": "Database Contents License (DbCL) v1.0",
-  "https://www.trafiklab.se/api/gtfs-sverige-2/licens": "GTFS Sverige 2",
-  "https://www.trafiklab.se/api/oxyfi-realtidspositionering/licens": "Trafiklab- Oxyfi-Realtidspositionering - Licens",
-  "https://creativecommons.org/licenses/by/3.0/": "Attribution 3.0 Unported (CC BY 3.0)",
-  "https://www.trafiklab.se/api/resrobot-reseplanerare/licens": "Trafiklab - ResRobot - Reseplanerare - Villkor",
-  "https://www.trafiklab.se/api/resrobot-stolptidtabeller-2/licens": "Trafiklab - SL resrobot - stolptidtabeller - licens",
-  "https://www.trafiklab.se/api/sl-hallplatser-och-linjer-2/licens": "Trafiklab - SL hållplatser och linjer 2 - Licens",
-  "https://www.trafiklab.se/api/sl-narliggande-hallplatser-2/licens": "Trafiklab - SL Närliggande hållplatser - Licens",
-  "https://www.trafiklab.se/api/sl-narliggande-hallplatser/licens": "Trafiklab - SL Närliggande hållplatser - Licens",
-  "https://www.trafiklab.se/api/sl-platsuppslag/licens": "Trafiklab - SL Platsuppslag - Licens",
-  "https://www.trafiklab.se/api/sl-realtidsinformation-4/licens": "Trafiklab - SL Realtidsinformation - Licens",
-  "https://www.trafiklab.se/api/sl-reseplanerare-3/licens": "Trafiklab - SL Reseplanerare 3 - Licens",
-  "https://www.trafiklab.se/api/sl-reseplanerare-31/licens": "Trafiklab - SL Reseplanerare 31 - Licens",
-  "https://www.trafiklab.se/api/sl-storningsinformation-2/licens": "Trafiklab - SL Störningsinformation 2 - Licens",
-  "https://www.trafiklab.se/api/sl-trafiklaget-2/licens": "Trafiklab - SL Trafikläget 2 - Licens",
-
   "http://publications.europa.eu/resource/authority/data-theme/AGRI": "Agriculture, fisheries, forestry and food",
   "http://publications.europa.eu/resource/authority/data-theme/ECON": "Economy and finance ",
   "http://publications.europa.eu/resource/authority/data-theme/EDUC": "Education, culture and sport",
@@ -50,49 +10,18 @@
   "http://publications.europa.eu/resource/authority/data-theme/HEAL": "Health",
   "http://publications.europa.eu/resource/authority/data-theme/INTR": "International issues",
   "http://publications.europa.eu/resource/authority/data-theme/JUST": "Justice, legal system and public safety",
-  "http://publications.europa.eu/resource/authority/data-theme/SOCI": "Population and society",
   "http://publications.europa.eu/resource/authority/data-theme/REGI": "Regions and cities",
+  "http://publications.europa.eu/resource/authority/data-theme/SOCI": "Population and society",
   "http://publications.europa.eu/resource/authority/data-theme/TECH": "Science and technology ",
   "http://publications.europa.eu/resource/authority/data-theme/TRAN": "Transport",
-
-  "http://publications.europa.eu/resource/authority/access-right/NON_PUBLIC": "Ej offentlig",
-  "http://publications.europa.eu/resource/authority/access-right/PUBLIC": "Publik",
-  "http://publications.europa.eu/resource/authority/access-right/RESTRICTED": "Begränsad",
-
-  "http://purl.org/adms/publishertype/NationalAuthority": "National authority",
-  "http://purl.org/adms/publishertype/LocalAuthority": "Local authority",
-  "http://purl.org/adms/publishertype/Company": "Company",
-  "http://purl.org/adms/publishertype/RegionalAuthority": "Regional authority",
-  "http://purl.org/adms/publishertype/NonProfitOrganisation": "Non profit organisation",
-  "http://purl.org/adms/publishertype/NonGovernmentalOrganisation": "Non governmental organisation",
-  "http://purl.org/adms/publishertype/Academia-ScientificOrganisation": "Academia/Scientific organisation",
-
-  "http://www.w3.org/2004/02/skos/core#inScheme": "Terminologies",
-
+  "http://purl.org/dc/terms/accessRights": "Access",
   "http://purl.org/dc/terms/accrualPeriodicity": "Update frequency",
-
-  "http://publications.europa.eu/resource/authority/frequency/OTHER": "Other",
-  "http://publications.europa.eu/resource/authority/frequency/DAILY": "Daily",
-  "http://publications.europa.eu/resource/authority/frequency/ANNUAL_2": "Annual",
-  "http://publications.europa.eu/resource/authority/frequency/CONT": "Continuous",
-  "http://publications.europa.eu/resource/authority/frequencyCONT": "Continuous",
-  "http://publications.europa.eu/resource/authority/frequency/QUARTERLY": "Quarterly",
-  "http://publications.europa.eu/resource/authority/frequency/MONTHLY": "Monthly",
-  "http://publications.europa.eu/resource/authority/frequency/UNKNOWN": "Unknown",
-  "http://publications.europa.eu/resource/authority/frequency/IRREG": "Irregular",
-  "http://publications.europa.eu/resource/authority/frequency/MONTHLY_3": "Three times a month",
-  "http://publications.europa.eu/resource/authority/frequency/WEEKLY_3": "Three times a week",
-  "http://publications.europa.eu/resource/authority/frequency/ANNUAL_3": "Three times a year",
-  "http://publications.europa.eu/resource/authority/frequency/WEEKLY_2": "Two times a week",
-  "http://publications.europa.eu/resource/authority/frequency/DAILY_2": "Two times a day",
-  "http://publications.europa.eu/resource/authority/frequency/MONTHLY_2": "Two times a month",
-  "http://publications.europa.eu/resource/authority/frequency/UPDATE_CONT": "Continuously updated",
-  "http://publications.europa.eu/resource/authority/frequency/BIWEEKLY": "Biweekly",
-  "http://publications.europa.eu/resource/authority/frequency/BIMONTHLY": "Bimonthly",
-  "http://publications.europa.eu/resource/authority/frequency/TRIENNIAL": "Triennial",
-  "http://publications.europa.eu/resource/authority/frequency/BIENNIAL": "Biennial",
-  "http://publications.europa.eu/resource/authority/frequency/WEEKLY": "Weekly",
-  "http://publications.europa.eu/resource/authority/frequency/ANNUAL": "Annual",
-  "http://purl.org/cld/freq/Annual": "Annual",
-  "api": "API/Data service"
+  "http://purl.org/dc/terms/format": "Format",
+  "http://purl.org/dc/terms/license": "License",
+  "http://purl.org/dc/terms/publisher": "Organisation",
+  "http://purl.org/dc/terms/subject": "National basic data",
+  "http://purl.org/dc/terms/type": "Organisation type",
+  "http://www.w3.org/2004/02/skos/core#inScheme": "Terminologies",
+  "http://www.w3.org/ns/dcat#theme": "Theme",
+  "http://xmlns.com/foaf/0.1/name": "Organisation"
 }
diff --git a/locales/en/routes.json b/locales/en/routes.json
index 95f2c1a83..ec27dc9c0 100644
--- a/locales/en/routes.json
+++ b/locales/en/routes.json
@@ -20,17 +20,17 @@
     "title": "Search concepts"
   },
   "cookies": {
-    "analytic-heading": "Analytical cookies",
     "analytic-description": "Analytical cookies gives us information about how visitors interact with the site. We use this information to maintain, operate and improve the user experience.",
-    "necessary-heading": "Necessary cookies",
-    "necessary-description": "Necessary cookies are required to enable the basic features of this site. These cookies are always active and you can not deactivate them.",
-    "settings-heading": "Settings for cookies",
+    "analytic-heading": "Analytical cookies",
+    "cookie-setting": "Save and accept all cookies",
+    "cookie-setting-open": "Save and accept",
+    "cookie-text": "We use cookies on Sweden's data portal to improve your experience of the website. By continuing to browse, you agree that we use cookies.",
     "customize-cookies-heading": "Customize cookie settings",
-    "path": "about-this-website/about-cookies",
     "link-title": "Read more about cookies",
-    "cookie-text": "We use cookies on Sweden's data portal to improve your experience of the website. By continuing to browse, you agree that we use cookies.",
-    "cookie-setting": "Save and accept all cookies",
-    "cookie-setting-open": "Save and accept"
+    "necessary-description": "Necessary cookies are required to enable the basic features of this site. These cookies are always active and you can not deactivate them.",
+    "necessary-heading": "Necessary cookies",
+    "path": "about-this-website/about-cookies",
+    "settings-heading": "Settings for cookies"
   },
   "data-collaboration": {
     "path": "",
diff --git a/locales/sv/common.json b/locales/sv/common.json
index c718a35f4..2e3441dc2 100644
--- a/locales/sv/common.json
+++ b/locales/sv/common.json
@@ -1,108 +1,108 @@
 {
-  "accessibility-report": "Tillgänglighetsredogörelse",
-  "datasets": "Datamängder",
   "about": "Om",
-  "term-with-concept": "Terminologi med begrepp",
+  "about-us": "Om oss",
+  "accessibility-report": "Tillgänglighetsredogörelse",
+  "active-filters": "Aktiva filter",
+  "all-concepts": "Alla begrepp",
+  "all-data-api": "All data & API:er",
+  "all-specs": "Alla specifikationer",
   "available-filters": "Tillgängliga filter",
-  "filter-options": "Filteralternativ",
   "beta": "BETA",
-  "beta-text1": "Sveriges dataportal utvecklas löpande. Skicka gärna dina ",
   "beta-link-text": "synpunkter",
+  "beta-text1": "Sveriges dataportal utvecklas löpande. Skicka gärna dina ",
   "beta-text2": " till oss!",
   "breadcrumb": "Brödsmulor",
   "change-lang": "en",
-  "contact": "Kontakt",
-  "cookies": "om_kakor",
-  "code-block": "Kodblock",
-  "copy-code": "Kopiera kod",
-  "code-copied-successfully": "Kod kopierad",
-  "code-copy-failed": "Misslyckades med kodkopiering",
-  "content-menu-heading": "Innehåll på sidan",
-  "clear-search": "Rensa sökfält",
   "clear-filters": "Rensa filter",
-  "close-filter": "Stäng filterlista",
-  "open-filter": "Öppna filterlista",
+  "clear-search": "Rensa sökfält",
   "close": "Stäng",
+  "close-filter": "Stäng filter",
   "close_menu": "Meny",
   "close_search": "Sök",
+  "code-block": "Kodblock",
+  "code-copied-successfully": "Kod kopierad",
+  "code-copy-failed": "Misslyckades med kodkopiering",
+  "community": "Community",
+  "concepts": "Begrepp",
+  "contact": "Kontakt",
+  "content-menu-heading": "Innehåll på sidan",
+  "cookie-settings": "Cookie-inställningar",
+  "cookies": "om_kakor",
+  "copy-code": "Kopiera kod",
+  "dataportal": "Dataportalen",
+  "datasets": "Datamängder",
   "digg-logo_text": "DIGG - Myndigheten för digital förvaltning",
+  "digg-managed_text": "Webbplatsen förvaltas av DIGG – Myndigheten för digital förvaltning",
+  "documentation-services": "Dokumentation och tjänster - Sveriges dataportal",
   "email_link": "Öppnar epost",
-  "external_link": "Leder till extern webbplats",
   "exploreapi": "Utforska API",
-  "concepts": "Begrepp",
+  "external_link": "Leder till extern webbplats",
+  "feedback": "Feedback på dataportal.se",
   "filter": "Filter",
-  "active-filters": "Aktiva filter",
+  "filter-options": "Filteralternativ",
   "filter-text": "När du filtrerar så uppdateras sidan automatiskt",
+  "github": "Öppen källkod på GitHub",
+  "go-to": "Gå till",
+  "guidance-share": "Vägledning för öppna och delade data",
+  "hide-filter": "Dölj filter",
+  "high-value-dataset": "Värdefull datamängd",
+  "home-text": "Hem",
   "illustration-1": "Illustration av kommunikation mellan dator och mobil",
   "illustration-2": "Illustration av ett hus",
   "illustration-3": "Illustration av dator som tar emot data",
-  "home-text": "Hem",
-  "hide-filter": "Dölj filter",
   "lang-linktext": "English",
-  "loading": "Laddar...",
+  "lang-path": "/sv",
   "load-more": "Ladda fler",
+  "loading": "Laddar...",
   "logo": "Sveriges Dataportal",
-  "logo-title": "Till startsidan",
   "logo-alt-title": "Sveriges Dataportal, till startsida",
   "logo-text": " - Myndigheten för digital förvaltning",
+  "logo-title": "Till startsidan",
+  "managed-and-developed-by": "förvaltas och utvecklas av ",
   "menu": "Meny",
+  "menu-anchor": "Sidinnehållsnavigation",
+  "menu-close": "Stäng meny",
+  "menu-container": "Sektionsnavigation",
   "menu-footer": "Sidfotslänkar",
-  "menu-submenu": "Undermeny",
+  "menu-form": "Formulärsteg",
+  "menu-form-bottom": "Formuläråtgärder",
   "menu-main": "Huvudnavigation",
-  "menu-close": "Stäng meny",
   "menu-open": "Öppna meny",
   "menu-service": "Webbplatsverktyg",
-  "menu-container": "Sektionsnavigation",
   "menu-sidebar": "Fullständig navigation",
-  "menu-anchor": "Sidinnehållsnavigation",
-  "menu-form": "Formulärsteg",
-  "menu-form-bottom": "Formuläråtgärder",
+  "menu-submenu": "Undermeny",
   "national-dataset": "Nationella grunddata",
+  "no": "Nej",
   "no-js-text": "JavaScript måste vara aktiverat för att söksidan ska fungera.",
-  "seo-title": "Sveriges Dataportal",
+  "of": "av",
+  "open": "Öppna",
+  "open-filter": "Öppna filterlista",
+  "open-in-email": "Öppnas i e-postprogram",
+  "open-in-new-tab": "Öppnas i ny flik",
+  "portal-numbers": "Portalen i siffror",
+  "preview": "Förhandsgranska",
+  "published-date": "Publiceringsdatum",
+  "read-more": "Läs mer",
   "search": "Sök",
-  "all-data-api": "All data & API:er",
-  "all-concepts": "Alla begrepp",
-  "all-specs": "Alla specifikationer",
   "search-api": "Data & API:er",
+  "search-concept": "Sök begrepp",
+  "search-content": "Sök innehåll",
   "search-data": "Sök data",
   "search-dataapi": "Sök data & API:er",
-  "search-concept": "Sök begrepp",
   "search-specs": "Sök specifikationer",
-  "specifications": "Specifikationer",
-  "search-content": "Sök innehåll",
-  "support-tools": "Stöd och verktyg",
-  "preview": "Förhandsgranska",
+  "self-assessment-tools": "Verktyg för självutvärdering",
+  "seo-title": "Sveriges Dataportal",
   "show-filter": "Visa filter",
   "skiptocontent": "Hoppa till innehåll",
-  "to-top": "Till toppen",
+  "specifications": "Specifikationer",
+  "support-tools": "Stöd och verktyg",
+  "term-with-concept": "Terminologi med begrepp",
+  "terminologies": "Terminologier",
+  "to": "till",
   "to-page": "Till sidan",
+  "to-top": "Till toppen",
+  "toolbox-share-data": "Verktygslåda för att dela data",
   "top-image": "Vy över Stockholm",
-  "of": "av",
-  "to": "till",
-  "terminologies": "Terminologier",
-  "about-us": "Om oss",
-  "portal-numbers": "Portalen i siffror",
-  "dataportal": "Dataportalen",
-  "digg-managed_text": "Webbplatsen förvaltas av DIGG – Myndigheten för digital förvaltning",
-  "yes": "Ja",
-  "no": "Nej",
-  "go-to": "Gå till",
-  "open": "Öppna",
-  "open-in-new-tab": "Öppnas i ny flik",
-  "open-in-email": "Öppnas i e-postprogram",
-  "self-assessment-tools": "Verktyg för självutvärdering",
   "training": "Utbildning för chefer och ledare",
-  "lang-path": "/sv",
-  "github": "Öppen källkod på GitHub",
-  "cookie-settings": "Cookie-inställningar",
-  "feedback": "Feedback på dataportal.se",
-  "toolbox-share-data": "Verktygslåda för att dela data",
-  "documentation-services": "Dokumentation och tjänster - Sveriges dataportal",
-  "guidance-share": "Vägledning för öppna och delade data",
-  "community": "Community",
-  "read-more": "Läs mer",
-  "published-date": "Publiceringsdatum",
-  "high-value-dataset": "Värdefull datamängd",
-  "managed-and-developed-by": "förvaltas och utvecklas av "
+  "yes": "Ja"
 }
diff --git a/locales/sv/filters.json b/locales/sv/filters.json
index 2879b20be..812835dbb 100644
--- a/locales/sv/filters.json
+++ b/locales/sv/filters.json
@@ -2,11 +2,12 @@
   "allchecktext": {
     "http://purl.org/dc/terms/license": "Alla med licens"
   },
-  "theme-input-label": "Sök inom filter",
   "group": {
     "access": "Tillgänglighet",
-    "type": "Typ av data",
     "actor": "Aktörer",
-    "distribution": "Distribution"
-  }
+    "distribution": "Distribution",
+    "share": "Delar",
+    "type": "Typ av data"
+  },
+  "theme-input-label": "Sök inom filter"
 }
diff --git a/locales/sv/pages.json b/locales/sv/pages.json
index 3777cebaa..452587960 100644
--- a/locales/sv/pages.json
+++ b/locales/sv/pages.json
@@ -1,124 +1,124 @@
 {
   "ai": {
     "heading": "Offentlig AI",
-    "preamble": "AI i praktiken - ett konkret stöd till offentlig sektor.",
+    "inspiration_description": "Goda exempel från offentlig förvaltning",
     "model": "Förtroendemodellen",
     "model_description": "Självutvärderingsverktyg för att bidra till transparens om AI-system",
-    "inspiration_description": "Goda exempel från offentlig förvaltning"
+    "preamble": "AI i praktiken - ett konkret stöd till offentlig sektor."
   },
   "concept_page": {
     "about_concept": "Om begrepp",
     "about_terminology": "Om terminologi",
-    "superior_concept": "Överordnade begrepp",
-    "no_superior_concept": "Har inga överordnade begrepp",
-    "subordinate_concepts": "Underordnade begrepp",
-    "no_subordinate_concepts": "Har inga underordnade begrepp",
-    "related_concepts": "Relaterade begrepp",
-    "no_related_concepts": "Har inga relaterade begrepp",
-    "visualization_concepts": "Visualisering av underordnade begrepp",
-    "terminology_concept": "Terminologi",
+    "alternativ_term": "Alternativ term",
+    "close_match": "Har snarlikt motsvarande begrepp ",
+    "concept_adress": "Adress för begrepp",
     "download_concept": "Nedladdning",
-    "number_of_concepts": "Antal begrepp inom terminologin",
+    "editorial_note": "Redaktionell anmärkning ",
+    "exact_match": "Har exakt motsvarande begrepp",
+    "example": "Exempel",
     "first_level_concepts": "Begrepp i terminologins första nivå",
-    "preferred_term": "Föredragen term",
-    "alternativ_term": "Alternativ term",
     "hidden_term": "Dold term",
-    "example": "Exempel",
     "historical_note": "Historisk anmärkning",
-    "editorial_note": "Redaktionell anmärkning ",
+    "no_related_concepts": "Har inga relaterade begrepp",
+    "no_subordinate_concepts": "Har inga underordnade begrepp",
+    "no_superior_concept": "Har inga överordnade begrepp",
     "note": "Anmärkning",
-    "exact_match": "Har exakt motsvarande begrepp",
-    "close_match": "Har snarlikt motsvarande begrepp ",
+    "number_of_concepts": "Antal begrepp inom terminologin",
+    "preferred_term": "Föredragen term",
+    "related_concepts": "Relaterade begrepp",
     "related_match": "Har relaterat motsvarande begrepp",
-    "superior_match": "Har överordnat motsvarande begrepp",
+    "subordinate_concepts": "Underordnade begrepp",
     "subordinate_match": "Har underordnat motsvarande begrepp",
-    "concept_adress": "Adress för begrepp",
-    "term_adress": "Adress för terminologi"
+    "superior_concept": "Överordnade begrepp",
+    "superior_match": "Har överordnat motsvarande begrepp",
+    "term_adress": "Adress för terminologi",
+    "terminology_concept": "Terminologi",
+    "visualization_concepts": "Visualisering av underordnade begrepp"
   },
   "concepts": {
-    "search": "Sök begrepp",
     "concepts": "begrepp",
-    "social_meta_title": "Sök begrepp",
-    "social_meta_description": "Begrepp på Sveriges Dataportal"
+    "search": "Sök begrepp",
+    "social_meta_description": "Begrepp på Sveriges Dataportal",
+    "social_meta_title": "Sök begrepp"
   },
   "content": {
-    "search": "Sök webbplatsinnehåll",
     "content": "Webbplatsinnehåll",
-    "social_meta_title": "Sök webbplatsinnehåll",
-    "social_meta_description": "Webbplatsinnehåll på Sveriges dataportal"
+    "search": "Sök webbplatsinnehåll",
+    "social_meta_description": "Webbplatsinnehåll på Sveriges dataportal",
+    "social_meta_title": "Sök webbplatsinnehåll"
   },
   "data": {
     "heading": "Data för ökad innovationskraft",
     "preamble": "Data är en strategisk resurs för samhällets utveckling. Det är en väg till transparens, innovation och tillväxt som skapas av medborgarna, näringslivet, akademin och myndigheter tillsammans. Här kan du utforska data och API:er, begrepp och terminologier samt specifikationer (informations- och datamodeller)"
   },
+  "dataservicepage": {
+    "api": "Om API"
+  },
   "datasetpage": {
-    "explore-api": "Utforska API",
     "about-dataset": "Om datamängd",
-    "download-dataset": "Hämta datamängd",
     "catalog": "Hämtad från katalog",
-    "use-data": "Använd data",
-    "download_link_adress": "Åtkomst",
-    "download_link": "Ladda ner",
-    "several_links": "Datat har flertalet länkar för nedladdning",
-    "several_links_header": "Dataresursen består av följande filer",
-    "no_title": "Ingen titel given",
-    "no_data": "Denna datamängd har inga dataresurser",
-    "read_about_api": "Läs mer om API",
-    "fileformat": "övrigt filformat",
-    "rdf": "Ladda ner metadata som RDF",
-    "view_more": "Visa mer",
-    "related_specifications": "Specifikation",
-    "view_less": "Visa mindre",
-    "dataservice": "Dataservice",
-    "keyword": "Nyckelord",
     "category": "Kategori",
     "contact-publisher": "Har du frågor eller synpunkter?",
     "contact-publisher-text": "Kontakta publicerande organisation för frågor, synpunkter och önskemål kring informationen på den här sidan. ",
     "contact-publisher-text2": "Du kan även vända dig till dataportalens ",
+    "dataservice": "Dataservice",
+    "download-dataset": "Hämta datamängd",
+    "download-metadata-as": "Ladda ner metadata som",
+    "download_link": "Ladda ner",
+    "download_link_adress": "Åtkomst",
+    "explore-api": "Utforska API",
+    "fileformat": "övrigt filformat",
+    "keyword": "Nyckelord",
     "mqa": "Metadatakvalitet",
     "mqa-catalog": "Metadata kvalitetkatalog",
-    "download-metadata-as": "Ladda ner metadata som"
+    "no_data": "Denna datamängd har inga dataresurser",
+    "no_title": "Ingen titel given",
+    "rdf": "Ladda ner metadata som RDF",
+    "read_about_api": "Läs mer om API",
+    "related_specifications": "Specifikation",
+    "several_links": "Datat har flertalet länkar för nedladdning",
+    "several_links_header": "Dataresursen består av följande filer",
+    "use-data": "Använd data",
+    "view_less": "Visa mindre",
+    "view_more": "Visa mer"
   },
   "datasets": {
-    "search": "Sök Data & Api:er",
     "datasets": "datamängder",
-    "social_meta_title": "Sök data & API:er",
-    "social_meta_description": "Data & API:er på Sveriges Dataportal"
-  },
-  "dataservicepage": {
-    "api": "Om API"
+    "search": "Sök Data & Api:er",
+    "social_meta_description": "Data & API:er på Sveriges Dataportal",
+    "social_meta_title": "Sök data & API:er"
   },
   "explore-api-page": {
-    "explore-api": "Utforska API",
-    "belongs-to-dataset": "Tillhör datamängd",
     "access-to-api": "Åtkomst till API",
     "access-to-api-txt": "På dataportalen tillhandahålls både API:er som är helt öppna och de som kräver en API-nyckel.",
-    "open-apis": "API:er som är öppna",
-    "open-apis-txt": "För API:er som är öppna går det att direkt göra anrop till och utforska datamängden.",
+    "api-contract": "API-kontrakt",
     "api-key": "API:er som kräver API-nyckel",
     "api-key-txt": "Vissa API:er måste låsas upp med en API-nyckel för att möjliggöra att kunna göra anrop och utforska datamängden. För att få tillgång till en API-nyckel behöver utgivaren kontaktas.",
+    "belongs-to-dataset": "Tillhör datamängd",
     "contact-publisher": "Kontakt till utgivare",
-    "api-contract": "API-kontrakt"
+    "explore-api": "Utforska API",
+    "open-apis": "API:er som är öppna",
+    "open-apis-txt": "För API:er som är öppna går det att direkt göra anrop till och utforska datamängden."
   },
   "form": {
-    "placeholder-text": "Fyll i ditt svar",
     "clear-all-text": "Rensa alla svar",
     "clear-confirm-text": "Är du säker på att du vill rensa alla svar?",
-    "upload-json-file": "Ladda upp sparade svar",
+    "form-continue-text": "Vill du gå vidare?",
+    "generate-pdf-text": "Generera PDF",
+    "go-back-text": "Tillbaka",
     "next-section-text": "Nästa avsnitt",
+    "placeholder-text": "Fyll i ditt svar",
     "previous-section-text": "Föregående avsnitt",
     "save-form": "Spara era svar på din dator",
-    "generate-pdf-text": "Generera PDF",
-    "form-continue-text": "Vill du gå vidare?",
     "start-evaluation-text": "Starta utvärdering",
-    "go-back-text": "Tillbaka"
+    "upload-json-file": "Ladda upp sparade svar"
   },
   "good-examples": {
+    "social_meta_description": "Goda exempel på Sveriges Dataportal",
+    "social_meta_title": "Goda exempel - Sveriges Dataportal",
     "text": "goda exempel",
     "title": "Goda exempel",
-    "view-all": "Visa alla",
-    "social_meta_title": "Goda exempel - Sveriges Dataportal",
-    "social_meta_description": "Goda exempel på Sveriges Dataportal"
+    "view-all": "Visa alla"
   },
   "highlight": {
     "highlight-header": "Sveriges Dataportal för ökad innovationskraft",
@@ -126,85 +126,98 @@
     "highlight-text2": "Sveriges Dataportal är ett nav som samordnar och tillgängliggör data som tillhandahålls av offentliga, privata och civilsamhällsorganisationer. Här finns enbart informationen om datamängderna. Själva datamängderna hämtas eller efterfrågas via länkar för åtkomst hos den organisation som ansvarar för den."
   },
   "listpage": {
-    "no-content": "Det finns inget innehåll att visa för tillfället.",
-    "fallback-tag": "Nyhet"
+    "fallback-tag": "Nyhet",
+    "no-content": "Det finns inget innehåll att visa för tillfället."
   },
   "news": {
+    "social_meta_description": "Nyheter på Sveriges Dataportal",
+    "social_meta_title": "Nyheter - Sveriges Dataportal",
     "text": "nyheter",
     "title": "Nyheter",
-    "view-all": "Visa alla",
-    "social_meta_title": "Nyheter - Sveriges Dataportal",
-    "social_meta_description": "Nyheter på Sveriges Dataportal"
+    "view-all": "Visa alla"
   },
   "notfoundpage": {
-    "heading": "404 - Sidan hittades inte",
     "body": "Vi kunde tyvärr inte hitta sidan du letade efter. Den kan ha blivit borttagen eller så har du skrivit in en felaktig länk.",
-    "startpage": "Startsidan",
-    "search-data": "Sök data"
+    "heading": "404 - Sidan hittades inte",
+    "search-data": "Sök data",
+    "startpage": "Startsidan"
   },
   "organisation_page": {
-    "org-type": "Organisationstyp",
-    "org-no": "Organisationens id",
-    "download_link": "Ladda ned metadata",
     "all-data": "Antal datamängder",
-    "view-all-data": "Visa alla datamängder",
-    "view-all-spec": "Visa alla specifikationer",
-    "open-data": "Öppna datamängder",
-    "protected-data": "Skyddade datamängder",
     "api-data": "Datamängder med API",
-    "hvd-data": "Värdefulla datamängder",
-    "fee-data": "Avgiftsbelagda datamängder",
-    "spec-data": "Datamängder som följer specifikation",
     "contact": "Kontakt",
-    "view-all-concepts": "Visa alla begrepp",
     "data-info": "Information om datamängderna",
+    "data-info-more": "Lorem ipsum dolor sit amet consectetur. Vitae aenean integer rhoncus enim urna. Eget eu semper ridiculus adipiscing ante enim. Adipiscing id ut sed sed sagittis faucibus nisl. Mi sem praesent id tempus vitae sagittis amet. Et ornare a duis sit odio scelerisque. Sed enim dolor massa dignissim ut. Platea quis proin purus auctor cursus semper dictum ultrices arcu.",
+    "download_link": "Ladda ned metadata",
+    "fee-data": "Avgiftsbelagda datamängder",
+    "hvd-data": "Värdefulla datamängder",
     "no-contact": "Inga kontaktuppgifter har angets",
     "no-org-type": "Inget organisationstyp har angetts",
-    "data-info-more": "Lorem ipsum dolor sit amet consectetur. Vitae aenean integer rhoncus enim urna. Eget eu semper ridiculus adipiscing ante enim. Adipiscing id ut sed sed sagittis faucibus nisl. Mi sem praesent id tempus vitae sagittis amet. Et ornare a duis sit odio scelerisque. Sed enim dolor massa dignissim ut. Platea quis proin purus auctor cursus semper dictum ultrices arcu."
+    "open-data": "Öppna datamängder",
+    "org-no": "Organisationens id",
+    "org-type": "Organisationstyp",
+    "protected-data": "Skyddade datamängder",
+    "spec-data": "Datamängder som följer specifikation",
+    "view-all-concepts": "Visa alla begrepp",
+    "view-all-data": "Visa alla datamängder",
+    "view-all-spec": "Visa alla specifikationer"
+  },
+  "organisations": {
+    "organisations": "organisationer",
+    "search": "Sök organisationer",
+    "social_meta_description": "Organisationer på Sveriges Dataportal",
+    "social_meta_title": "Sök organisationer"
   },
   "os": {
     "heading": "Öppen källkod",
     "preamble": "Öppen källkod - även kallad open source och öppen programvara - ökar betydligt innovationstakten då aktörer kan samutveckla, anpassa och bygga vidare på befintliga lösningar."
   },
   "redirect": {
-    "pagenotfound_header": "Oj, sidan kan inte hittas!",
-    "pagenotfound-text": "Det kan bero på att oppnadata.se flyttade till dataportal.se den 23 september 2020. Förhoppningsvis kan de här länkarna hjälpa dig att hitta det du söker.",
     "pagenotfound-label": "Sveriges Dataportal",
     "pagenotfound-link": "Startsidan",
-    "pagenotfound-link2": "Sök data"
+    "pagenotfound-link2": "Sök data",
+    "pagenotfound-text": "Det kan bero på att oppnadata.se flyttade till dataportal.se den 23 september 2020. Förhoppningsvis kan de här länkarna hjälpa dig att hitta det du söker.",
+    "pagenotfound_header": "Oj, sidan kan inte hittas!"
   },
   "search": {
-    "search": "Sök data",
-    "search-tabs": "Söktabbar navigering",
-    "search-type-navigation": "Söktyp navigering",
-    "dataset-hits": "resultat",
+    "compact-list": "Kompakt lista",
+    "compact-list-active": "Kompakt lista aktiv",
     "concept-hits": "resultat",
-    "specification-hits": "resultat",
-    "content-hits": "resultat",
-    "next-page": "Nästa",
-    "prev-page": "Föregående",
-    "first-page": "Första",
-    "showing": "Visar",
-    "results": "resultat",
-    "datasets": "Data & API:er",
     "concepts": "Begrepp",
-    "specifications": "Specifikationer",
     "content": "Webbplatsinnehåll",
-    "organization": "Organisationer",
-    "relevance": "Relevans",
+    "content-hits": "resultat",
+    "dataset-hits": "resultat",
+    "datasets": "Data & API:er",
     "date": "Senast ändrad",
-    "sort": "Sortera",
+    "detailed-list": "Detaljerad lista",
+    "detailed-list-active": "Detaljerad lista aktiv",
+    "filtersearch": "Sök inom filter",
+    "first-page": "Första",
+    "less-filters": "Visa färre filter",
+    "list": "Lista",
+    "list-view": "Listvy",
+    "more-filters": "Visa fler filter",
+    "next-page": "Nästa",
     "nohits": "Inga träffar",
     "numberofhits": "Antal träffar",
+    "numberofhits-100": "100 träffar",
     "numberofhits-20": "20 träffar",
     "numberofhits-50": "50 träffar",
-    "numberofhits-100": "100 träffar",
-    "filtersearch": "Sök inom filter",
+    "organisations": "Organisationer",
+    "pagination-next-txt": "Nästa",
+    "prev-page": "Föregående",
+    "relevance": "Relevans",
+    "results": "resultat",
+    "search": "Sök data",
+    "search-tabs": "Söktabbar navigering",
     "search-tips": "Söktips",
-    "search-tips-search-head": "Vidga sökning med asterisk (*)",
-    "search-tips-search-txt": "En sökning kan vidgas om det läggs till en asterisk (*) i slutet av sökordet. Det gör att sökningen inkluderar olika ändelser av aktuellt sökord. Exempelvis ger sökningen laddst* träffar på laddstolpe, laddstolpar, laddstation etc.",
     "search-tips-filter-head": "Filtrering",
     "search-tips-filter-txt": "Sökning med olika filter (t.ex. kategorier och licenser) skapar ett OCH mellan filtren. Sökning med flera alternativ inom ett filter (t.ex. flera olika format) skapar ett ELLER mellan alternativen.",
+    "search-tips-license-head": "Licenser",
+    "search-tips-license-link": "licenser",
+    "search-tips-license-txt": "Licenser är regler för hur data får användas, läs mer om",
+    "search-tips-search-head": "Vidga sökning med asterisk (*)",
+    "search-tips-search-txt": "En sökning kan vidgas om det läggs till en asterisk (*) i slutet av sökordet. Det gör att sökningen inkluderar olika ändelser av aktuellt sökord. Exempelvis ger sökningen laddst* träffar på laddstolpe, laddstolpar, laddstation etc.",
     "search-tips-searchfilter-head": "Sökning inom filter",
     "search-tips-searchfilter-txt": "Inom filtren för kategori, organisation och format går det att göra en sökning, t.ex. går det att söka efter en särskild myndighet eller kommun inom filtret för organisation.",
     "search-tips-sort-head": "Sortering",
@@ -213,67 +226,61 @@
     "search-tips-sort-txt3": " matchas sökterm mot rubrik. Vid sortering med",
     "search-tips-sort-txt4": "Senast ändrad",
     "search-tips-sort-txt5": " visas senast uppdaterad metadata (information om datamängden). Att metadata är uppdaterat behöver inte innebära att själva datamängden är det.",
-    "search-tips-license-head": "Licenser",
-    "search-tips-license-txt": "Licenser är regler för hur data får användas, läs mer om",
-    "search-tips-license-link": "licenser",
-    "list-view": "Listvy",
-    "more-filters": "Visa fler filter",
-    "less-filters": "Visa färre filter",
-    "detailed-list": "Detaljerad lista",
-    "detailed-list-active": "Detaljerad lista aktiv",
-    "compact-list": "Kompakt lista",
-    "compact-list-active": "Kompakt lista aktiv",
-    "pagination-next-txt": "Nästa"
+    "search-type-navigation": "Söktyp navigering",
+    "showing": "Visar",
+    "sort": "Sortera",
+    "specification-hits": "resultat",
+    "specifications": "Specifikationer"
   },
   "specification_page": {
-    "address": "Adress för specifikation",
     "about_specification": "Om specifikation",
-    "resource_specification": "Resurs",
-    "scheme_download": "Ladda ner schema",
+    "address": "Adress för specifikation",
+    "download": "Ladda ner",
     "guidance_download": "Ladda ner guidance",
-    "specification_download": "Åtkomst",
     "related_datasets": "Relaterade datamängder",
-    "download": "Ladda ner"
+    "resource_specification": "Resurs",
+    "scheme_download": "Ladda ner schema",
+    "specification_download": "Åtkomst"
   },
   "specifications": {
     "search": "Sök specifikationer",
-    "specifications": "specifikationer",
+    "social_meta_description": "Specifikationer på Sveriges Dataportal",
     "social_meta_title": "Sök specifikationer",
-    "social_meta_description": "Specifikationer på Sveriges Dataportal"
+    "specifications": "specifikationer"
   },
   "startpage": {
+    "data-api-header": "Data och API:er",
+    "datasets_by_category": "Data efter kategorier",
+    "explore_concepts": "Utforska begrepp och terminologier",
+    "explore_datasets": "Utforska data och API:er",
+    "explore_specs": "Utforska specifikationer av informations- och datamodeller",
+    "good-examples": "Goda exempel",
     "heading": "Sveriges Dataportal för ökad innovationskraft",
+    "news": "Nyheter",
+    "open-source-header": "Öppen källkod",
     "preamble": "Dataportalen är till för er som har data, för er som redan använder och utvecklar kring data, såväl som för er som precis har börjat fundera på hur den samlade kraften i vår data kan förflytta samhället framåt.",
+    "public-ai-header": "Offentlig AI",
+    "search_datasets_format": "Sök datamängder inom kategorin {{category}}",
     "search_placeholder": "Sök data och API:er",
+    "search_title_1": "Sök och utforska data i Sverige",
     "seo_description": "Sveriges nationella dataportal för att hitta, utforska och använda data från offentlig och privat sektor",
     "seo_title": "Sveriges Dataportal",
-    "search_title_1": "Sök och utforska data i Sverige",
-    "explore_datasets": "Utforska data och API:er",
-    "explore_concepts": "Utforska begrepp och terminologier",
-    "explore_specs": "Utforska specifikationer av informations- och datamodeller",
-    "search_datasets_format": "Sök datamängder inom kategorin {{category}}",
-    "datasets_by_category": "Data efter kategorier",
-    "social_meta_title": "Sveriges Dataportal",
     "social_meta_description": "Sveriges nationella dataportal för att hitta, utforska och använda data från offentlig och privat sektor",
-    "data-api-header": "Data och API:er",
-    "open-source-header": "Öppen källkod",
-    "public-ai-header": "Offentlig AI",
-    "news": "Nyheter",
-    "good-examples": "Goda exempel"
+    "social_meta_title": "Sveriges Dataportal"
   },
   "statistic": {
-    "statistic-header": "Statistik på dataportalen",
     "dataset-numbers": "Data per månad",
-    "statistic-numbers": "Portalen i siffror",
-    "top-organizations": "Organisationer med flest datamängder",
-    "top-categories": "Kategorier med flest datamängder",
+    "social_meta_description": "Statistiken som visualiseras på startsidan presenteras här i textform",
+    "social_meta_title": "Statistik på dataportalen",
+    "statistic-header": "Statistik på dataportalen",
     "statistic-link": "Beskrivning av statistik",
-    "statistic-page-text": "Statistiken som visualiseras på startsidan presenteras här i textform.  Statistiken visar mängden data på Sveriges Dataportal per månad, topp 5 gällande datamängder för organisationer och kategorier.",
+    "statistic-numbers": "Portalen i siffror",
     "statistic-page-header": "Statistik",
+    "statistic-page-link": "statistik",
     "statistic-page-numberofdatasets": "Antal data på dataportalen idag: ",
     "statistic-page-seotitle": "Statistik - Sveriges Dataportal",
-    "statistic-page-link": "statistik",
-    "social_meta_title": "Statistik på dataportalen",
-    "social_meta_description": "Statistiken som visualiseras på startsidan presenteras här i textform"
+    "statistic-page-text": "Statistiken som visualiseras på startsidan presenteras här i textform.  Statistiken visar mängden data på Sveriges Dataportal per månad, topp 5 gällande datamängder för organisationer och kategorier.",
+    "top-categories": "Kategorier med flest datamängder",
+    "top-organisations": "Organisationer med flest datamängder"
   }
 }
diff --git a/locales/sv/resources.json b/locales/sv/resources.json
index a2aaf1dfd..93dbdb864 100644
--- a/locales/sv/resources.json
+++ b/locales/sv/resources.json
@@ -1,46 +1,6 @@
 {
-  "http://purl.org/dc/terms/publisher": "Organisation",
-  "http://www.w3.org/ns/dcat#theme": "Kategori",
-  "http://purl.org/dc/terms/type": "Organisationstyp",
-  "http://purl.org/dc/terms/format": "Format",
-  "http://purl.org/dc/terms/accessRights": "Åtkomsträttigheter",
-  "http://purl.org/dc/terms/license": "Licens",
+  "api": "API/Datatjänst",
   "http://data.europa.eu/r5r/applicableLegislation": "Värdefulla datamängder",
-  "http://purl.org/dc/terms/subject": "Nationella grunddata",
-
-  "https://dataportal.se/concepts/licensecategories/otherlicense": "Övriga licenser",
-  "https://dataportal.se/concepts/licensecategories/nolicense": "Saknar licens",
-  "http://creativecommons.org/publicdomain/zero/1.0/": "CC0",
-  "http://creativecommons.org/licenses/by/4.0/": "CC BY",
-  "http://creativecommons.org/licenses/by-sa/4.0/": "CC BY-SA",
-  "http://creativecommons.org/licenses/by-nc-sa/4.0/": "CC BY-NC-SA",
-  "http://creativecommons.org/licenses/by-nd/4.0/": "CC BY-ND",
-  "http://creativecommons.org/licenses/by-nc/4.0/": "CC BY-NC",
-
-  "https://creativecommons.org/licenses/by/4.0/deed.sv": "Erkännande 4.0 Internationell (CC BY 4.0)",
-  "http://creativecommons.org/licenses/by-nc/3.0/": "CC BY-NC 3.0 Non commercial",
-  "https://creativecommons.org/publicdomain/zero/1.0/deed.sv": "CC0 1.0 universell",
-  "http://creativecommons.org/licenses/by/2.5/se/": "Erkännande 2.5 Sverige (CC BY 2.5 SE)",
-  "https://creativecommons.org/licenses/by/3.0//": "Attribution 3.0 Unported (CC BY 3.0)",
-  "http://creativecommons.org/licenses/by/2.5/se": "Erkännande 2.5 Sverige (CC BY 2.5 SE)",
-  "https://creativecommons.org/licenses/by-nd/4.0/deed.sv": "Erkännande-IngaBearbetningar 4.0 Internationell (CC BY-ND 4.0)",
-  "http://www.creativecommons.se/om-cc/licenserna/": "Om Creative Commons licens",
-  "https://opendatacommons.org/licenses/dbcl/1.0/": "Database Contents License (DbCL) v1.0",
-  "https://www.trafiklab.se/api/gtfs-sverige-2/licens": "GTFS Sverige 2",
-  "https://www.trafiklab.se/api/oxyfi-realtidspositionering/licens": "Trafiklab- Oxyfi-Realtidspositionering - Licens",
-  "https://creativecommons.org/licenses/by/3.0/": "Attribution 3.0 Unported (CC BY 3.0)",
-  "https://www.trafiklab.se/api/resrobot-reseplanerare/licens": "Trafiklab - ResRobot - Reseplanerare - Villkor",
-  "https://www.trafiklab.se/api/resrobot-stolptidtabeller-2/licens": "Trafiklab - SL resrobot - stolptidtabeller - licens",
-  "https://www.trafiklab.se/api/sl-hallplatser-och-linjer-2/licens": "Trafiklab - SL hållplatser och linjer 2 - Licens",
-  "https://www.trafiklab.se/api/sl-narliggande-hallplatser-2/licens": "Trafiklab - SL Närliggande hållplatser - Licens",
-  "https://www.trafiklab.se/api/sl-narliggande-hallplatser/licens": "Trafiklab - SL Närliggande hållplatser - Licens",
-  "https://www.trafiklab.se/api/sl-platsuppslag/licens": "Trafiklab - SL Platsuppslag - Licens",
-  "https://www.trafiklab.se/api/sl-realtidsinformation-4/licens": "Trafiklab - SL Realtidsinformation - Licens",
-  "https://www.trafiklab.se/api/sl-reseplanerare-3/licens": "Trafiklab - SL Reseplanerare 3 - Licens",
-  "https://www.trafiklab.se/api/sl-reseplanerare-31/licens": "Trafiklab - SL Reseplanerare 31 - Licens",
-  "https://www.trafiklab.se/api/sl-storningsinformation-2/licens": "Trafiklab - SL Störningsinformation 2 - Licens",
-  "https://www.trafiklab.se/api/sl-trafiklaget-2/licens": "Trafiklab - SL Trafikläget 2 - Licens",
-
   "http://publications.europa.eu/resource/authority/data-theme/AGRI": "Jordbruk, fiske, skogsbruk och livsmedel",
   "http://publications.europa.eu/resource/authority/data-theme/ECON": "Ekonomi och finans",
   "http://publications.europa.eu/resource/authority/data-theme/EDUC": "Utbildning, kultur och sport",
@@ -50,47 +10,18 @@
   "http://publications.europa.eu/resource/authority/data-theme/HEAL": "Hälsa",
   "http://publications.europa.eu/resource/authority/data-theme/INTR": "Internationella frågor",
   "http://publications.europa.eu/resource/authority/data-theme/JUST": "Rättvisa, rättsliga system och allmän säkerhet",
-  "http://publications.europa.eu/resource/authority/data-theme/SOCI": "Befolkning och samhälle",
   "http://publications.europa.eu/resource/authority/data-theme/REGI": "Regioner och städer",
+  "http://publications.europa.eu/resource/authority/data-theme/SOCI": "Befolkning och samhälle",
   "http://publications.europa.eu/resource/authority/data-theme/TECH": "Vetenskap och teknik",
   "http://publications.europa.eu/resource/authority/data-theme/TRAN": "Transport",
-  "http://publications.europa.eu/resource/authority/access-right/NON_PUBLIC": "Ej offentlig",
-  "http://publications.europa.eu/resource/authority/access-right/PUBLIC": "Publik",
-  "http://publications.europa.eu/resource/authority/access-right/RESTRICTED": "Begränsad",
-  "http://purl.org/adms/publishertype/NationalAuthority": "Nationell myndighet",
-  "http://purl.org/adms/publishertype/LocalAuthority": "Lokal myndighet/kommun",
-  "http://purl.org/adms/publishertype/Company": "Företag",
-  "http://purl.org/adms/publishertype/RegionalAuthority": "Regional myndighet/landsting",
-  "http://purl.org/adms/publishertype/NonProfitOrganisation": "Ej vinstdrivande organisation",
-  "http://purl.org/adms/publishertype/NonGovernmentalOrganisation": "Icke-statlig organisation",
-  "http://purl.org/adms/publishertype/Academia-ScientificOrganisation": "Akademia/Vetenskaplig organisation",
-
-  "http://www.w3.org/2004/02/skos/core#inScheme": "Terminologier",
-
+  "http://purl.org/dc/terms/accessRights": "Åtkomsträttigheter",
   "http://purl.org/dc/terms/accrualPeriodicity": "Uppdateringsfrekvens",
-
-  "http://publications.europa.eu/resource/authority/frequency/OTHER": "Annan",
-  "http://publications.europa.eu/resource/authority/frequency/DAILY": "Dagligen",
-  "http://publications.europa.eu/resource/authority/frequency/ANNUAL_2": "Halvårs",
-  "http://publications.europa.eu/resource/authority/frequency/CONT": "Kontinuerlig",
-  "http://publications.europa.eu/resource/authority/frequencyCONT": "Kontinuerlig",
-  "http://publications.europa.eu/resource/authority/frequency/QUARTERLY": "Kvartalsvis",
-  "http://publications.europa.eu/resource/authority/frequency/MONTHLY": "Månatligen",
-  "http://publications.europa.eu/resource/authority/frequency/UNKNOWN": "Obekant",
-  "http://publications.europa.eu/resource/authority/frequency/IRREG": "Oregelbundet",
-  "http://publications.europa.eu/resource/authority/frequency/MONTHLY_3": "Tre gånger per månad",
-  "http://publications.europa.eu/resource/authority/frequency/WEEKLY_3": "Tre gånger per vecka",
-  "http://publications.europa.eu/resource/authority/frequency/ANNUAL_3": "Tre gånger per år",
-  "http://publications.europa.eu/resource/authority/frequency/WEEKLY_2": "Två gånger per vecka",
-  "http://publications.europa.eu/resource/authority/frequency/DAILY_2": "Två gånger per dag",
-  "http://publications.europa.eu/resource/authority/frequency/MONTHLY_2": "Två gånger per månad",
-  "http://publications.europa.eu/resource/authority/frequency/UPDATE_CONT": "Uppdateras kontinuerligt",
-  "http://publications.europa.eu/resource/authority/frequency/BIWEEKLY": "Var fjortonde dag",
-  "http://publications.europa.eu/resource/authority/frequency/BIMONTHLY": "Varannan månad",
-  "http://publications.europa.eu/resource/authority/frequency/TRIENNIAL": "Vart tredje år",
-  "http://publications.europa.eu/resource/authority/frequency/BIENNIAL": "Vartannat år",
-  "http://publications.europa.eu/resource/authority/frequency/WEEKLY": "Veckovis",
-  "http://publications.europa.eu/resource/authority/frequency/ANNUAL": "Årlig",
-  "http://purl.org/cld/freq/Annual": "Årlig",
-   "api": "API/Datatjänst"
+  "http://purl.org/dc/terms/format": "Format",
+  "http://purl.org/dc/terms/license": "Licens",
+  "http://purl.org/dc/terms/publisher": "Organisation",
+  "http://purl.org/dc/terms/subject": "Nationella grunddata",
+  "http://purl.org/dc/terms/type": "Organisationstyp",
+  "http://www.w3.org/2004/02/skos/core#inScheme": "Terminologier",
+  "http://www.w3.org/ns/dcat#theme": "Kategori",
+  "http://xmlns.com/foaf/0.1/name": "Organisation"
 }
diff --git a/locales/sv/routes.json b/locales/sv/routes.json
index 01ee61c91..df17ef773 100644
--- a/locales/sv/routes.json
+++ b/locales/sv/routes.json
@@ -20,17 +20,17 @@
     "title": "Sök begrepp"
   },
   "cookies": {
-    "analytic-heading": "Analytiska kakor",
     "analytic-description": "Ger oss information om hur vår webbplats används som gör att vi kan underhålla, driva och förbättra användarupplevelsen.",
-    "necessary-heading": "Nödvändiga kakor",
-    "necessary-description": "En del kakor gör att våra tjänster är säkra och fungerar som de ska. Dessa nödvändiga kakor är alltid aktiverade och går inte att inaktivera.",
-    "settings-heading": "Inställningar för kakor",
+    "analytic-heading": "Analytiska kakor",
+    "cookie-setting": "Spara och godkänn alla kakor",
+    "cookie-setting-open": "Spara och godkänn",
+    "cookie-text": "På dataportal.se använder vi kakor (cookies) för att webbplatsen ska fungera på ett bra sätt för dig. Med hjälp av webbanalys och anonymiserad data vidareutvecklas webbplatsen ytterligare. Genom att surfa vidare godkänner du att vi använder kakor.",
     "customize-cookies-heading": "Anpassa inställningar för kakor",
-    "path": "om-webbplatsen/om-kakor",
     "link-title": "Läs mer om kakor",
-    "cookie-text": "På dataportal.se använder vi kakor (cookies) för att webbplatsen ska fungera på ett bra sätt för dig. Med hjälp av webbanalys och anonymiserad data vidareutvecklas webbplatsen ytterligare. Genom att surfa vidare godkänner du att vi använder kakor.",
-    "cookie-setting": "Spara och godkänn alla kakor",
-    "cookie-setting-open": "Spara och godkänn"
+    "necessary-description": "En del kakor gör att våra tjänster är säkra och fungerar som de ska. Dessa nödvändiga kakor är alltid aktiverade och går inte att inaktivera.",
+    "necessary-heading": "Nödvändiga kakor",
+    "path": "om-webbplatsen/om-kakor",
+    "settings-heading": "Inställningar för kakor"
   },
   "data-collaboration": {
     "path": "datasamverkan",
diff --git a/pages/organisations/index.tsx b/pages/organisations/index.tsx
new file mode 100644
index 000000000..f15b32611
--- /dev/null
+++ b/pages/organisations/index.tsx
@@ -0,0 +1,9 @@
+import { NextPage } from "next";
+
+import { SearchPageEntryscape } from "@/features/search/search-page/search-page-entryscape";
+
+const OrganisationsPage: NextPage = () => (
+  <SearchPageEntryscape searchType="organisations" />
+);
+
+export default OrganisationsPage;
diff --git a/providers/entrystore-provider/index.tsx b/providers/entrystore-provider/index.tsx
index 6802c34be..4f33f7e3e 100644
--- a/providers/entrystore-provider/index.tsx
+++ b/providers/entrystore-provider/index.tsx
@@ -14,7 +14,7 @@ import { ESFacetField, ESFacetFieldValue } from "@/types/search";
 import { Choice, fetchDCATMeta } from "@/utilities";
 import {
   getLocalizedChoiceLabel,
-  getSimplifiedLocalizedValue,
+  getLocalizedValue,
   getTemplateChoices,
 } from "@/utilities/entrystore-utils";
 
@@ -186,17 +186,13 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
       const resourceUri = entry.getResourceURI();
 
       const title =
-        getSimplifiedLocalizedValue(metadata, "dcterms:title", resourceUri) ||
-        getSimplifiedLocalizedValue(metadata, "skos:prefLabel", resourceUri) ||
-        getSimplifiedLocalizedValue(metadata, "foaf:name", resourceUri);
+        getLocalizedValue(metadata, "dcterms:title", resourceUri) ||
+        getLocalizedValue(metadata, "skos:prefLabel", resourceUri) ||
+        getLocalizedValue(metadata, "foaf:name", resourceUri);
 
       const description =
-        getSimplifiedLocalizedValue(metadata, "skos:definition", resourceUri) ||
-        getSimplifiedLocalizedValue(
-          metadata,
-          "dcterms:description",
-          resourceUri,
-        );
+        getLocalizedValue(metadata, "skos:definition", resourceUri) ||
+        getLocalizedValue(metadata, "dcterms:description", resourceUri);
 
       const publisherUri = metadata.findFirstValue(
         resourceUri,
@@ -209,8 +205,9 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
           try {
             const publisherEntry =
               await esu.getEntryByResourceURI(publisherUri);
+
             if (publisherEntry) {
-              publisher = getSimplifiedLocalizedValue(
+              publisher = getLocalizedValue(
                 publisherEntry.getAllMetadata(),
                 "foaf:name",
                 publisherUri,
@@ -239,7 +236,7 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
                   const publisherEntry =
                     await esu.getEntryByResourceURI(publisherUri);
                   if (publisherEntry) {
-                    publisher = getSimplifiedLocalizedValue(
+                    publisher = getLocalizedValue(
                       publisherEntry.getAllMetadata(),
                       "foaf:name",
                       publisherUri,
@@ -350,12 +347,12 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
     const contactPoint = metadata.findFirstValue(null, "dcat:contactPoint");
 
     const contactEntry = await esu.getEntryByResourceURI(contactPoint);
-    const name = getSimplifiedLocalizedValue(
+    const name = getLocalizedValue(
       contactEntry.getAllMetadata(),
       "http://www.w3.org/2006/vcard/ns#fn",
     );
     const email = parseEmail(
-      getSimplifiedLocalizedValue(
+      getLocalizedValue(
         contactEntry.getAllMetadata(),
         "http://www.w3.org/2006/vcard/ns#hasEmail",
       ),
@@ -374,10 +371,7 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
 
     const datasetArray = datasets.map((ds: Entry) => {
       return {
-        title: getSimplifiedLocalizedValue(
-          ds.getAllMetadata(),
-          "dcterms:title",
-        ),
+        title: getLocalizedValue(ds.getAllMetadata(), "dcterms:title"),
         url: `/${lang}/datasets/${es.getContextId(
           ds.getEntryInfo().getMetadataURI(),
         )}_${ds.getId()}`,
@@ -569,10 +563,7 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
           data.terms.total = terms.getSize();
           data.terms.termsInfo = termsList
             .map((t) => ({
-              title: getSimplifiedLocalizedValue(
-                t.getAllMetadata(),
-                "dcterms:title",
-              ),
+              title: getLocalizedValue(t.getAllMetadata(), "dcterms:title"),
               url: t.getResourceURI().startsWith("https://dataportal.se")
                 ? new URL(t.getResourceURI()).pathname.replace(
                     "concepts",
@@ -597,7 +588,7 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
       const mqa = es.getEntryURI(entry.getContext().getId(), "_quality");
       const mqaEntry = await es.getEntry(mqa);
       const mqaMetadata = mqaEntry.getAllMetadata();
-      const title = getSimplifiedLocalizedValue(mqaMetadata, "dcterms:title");
+      const title = getLocalizedValue(mqaMetadata, "dcterms:title");
       const url = `/metadatakvalitet/katalog/_quality/${entry
         .getContext()
         .getId()}`;
@@ -633,10 +624,7 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
     const termEntry = await esu.getEntryByResourceURI(termUri);
 
     return {
-      title: getSimplifiedLocalizedValue(
-        termEntry.getAllMetadata(),
-        "dcterms:title",
-      ),
+      title: getLocalizedValue(termEntry.getAllMetadata(), "dcterms:title"),
       url: termUri.startsWith("https://dataportal.se")
         ? new URL(termUri).pathname.replace("concepts", "terminology")
         : `/${lang}/externalterminology?resource=${termUri}`,
@@ -663,10 +651,7 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
         return resourceEntries
           .filter((e: Entry) => e)
           .map((e: Entry) => ({
-            title: getSimplifiedLocalizedValue(
-              e.getAllMetadata(),
-              "dcterms:title",
-            ),
+            title: getLocalizedValue(e.getAllMetadata(), "dcterms:title"),
             url: e.getResourceURI().startsWith("https://dataportal.se")
               ? new URL(e.getResourceURI()).pathname
               : `/${lang}/externalspecification?resource=${e.getResourceURI()}`,
@@ -685,10 +670,7 @@ export const EntrystoreProvider: FC<EntrystoreProviderProps> = ({
         return specifications
           .filter((e: Entry) => e)
           .map((e: Entry) => ({
-            title: getSimplifiedLocalizedValue(
-              e.getAllMetadata(),
-              "dcterms:title",
-            ),
+            title: getLocalizedValue(e.getAllMetadata(), "dcterms:title"),
             url: e.getResourceURI().startsWith("https://dataportal.se")
               ? new URL(e.getResourceURI()).pathname
               : `/${lang}/externalspecification?resource=${e.getResourceURI()}`,
diff --git a/styles/base.css b/styles/base.css
index d56da73e8..865dd7f0a 100644
--- a/styles/base.css
+++ b/styles/base.css
@@ -109,6 +109,13 @@ body {
   .button--secondary.active {
     @apply bg-brown-600 text-white [&_path]:fill-white [&_svg]:rotate-180;
   }
+  .button--light {
+    @apply bg-brown-200 text-brown-600 hover:bg-textSecondary focus-visible:bg-textSecondary hover:text-brown-100 focus-visible:text-brown-100
+    group-hover:bg-textSecondary group-hover:text-brown-100 group-focus:bg-textSecondary group-focus:text-brown-100 [&_path]:fill-brown-600;
+  }
+  .button--light.active {
+    @apply bg-textSecondary text-brown-100 [&_path]:fill-brown-100;
+  }
   .button--plain {
     @apply bg-transparent text-brown-600 hover:bg-brown-200 focus-visible:bg-brown-200 group-focus:bg-brown-200 
     [&:not(.no-group-hover)]:group-hover:bg-brown-200 [&_path]:fill-brown-600;
diff --git a/styles/entryscape.css b/styles/entryscape.css
index 43d073669..f959854a3 100644
--- a/styles/entryscape.css
+++ b/styles/entryscape.css
@@ -136,7 +136,7 @@
 }
 
 .modal-ux-inner .modal-ux-header button::after {
-  content: url("../assets/icons/closeCross.svg");
+  content: url("../assets/icons/cross.svg");
 }
 
 .modal-ux-inner .modal-ux-content h4,
@@ -183,7 +183,7 @@
 }
 
 .esbExpandButton[aria-expanded="false"]::after {
-  content: url("../assets/icons/chevronDown.svg");
+  content: url("../assets/icons/chevron-down.svg");
   @apply h-[1.5rem] w-[1.5rem];
 }
 
@@ -192,7 +192,7 @@
 }
 
 .esbExpandButton[aria-expanded="true"]::after {
-  content: url("../assets/icons/chevronUp.svg");
+  content: url("../assets/icons/chevron-up.svg");
   @apply h-[1.5rem] w-[1.5rem];
 }
 
@@ -247,7 +247,7 @@
   -moz-appearance: none;
   -webkit-appearance: none;
   appearance: none;
-  background-image: url("../assets/icons/chevronDown.svg");
+  background-image: url("../assets/icons/chevron-down.svg");
   background-repeat: no-repeat;
   background-position: right 5px center;
   background-size: 24px;
@@ -561,22 +561,22 @@
 }
 
 .opblock-summary-control[aria-expanded="false"]::after {
-  content: url("../assets/icons/chevronDown.svg");
+  content: url("../assets/icons/chevron-down.svg");
   @apply ml-auto h-[1.5rem] w-[1.5rem];
 }
 
 .opblock-summary-control[aria-expanded="true"]::after {
-  content: url("../assets/icons/chevronUp.svg");
+  content: url("../assets/icons/chevron-up.svg");
   @apply ml-auto h-[1.5rem] w-[1.5rem];
 }
 
 .expand-operation[aria-expanded="false"]::after {
-  content: url("../assets/icons/chevronDown.svg");
+  content: url("../assets/icons/chevron-down.svg");
   @apply ml-auto h-[1.5rem] w-[1.5rem];
 }
 
 .expand-operation[aria-expanded="true"]::after {
-  content: url("../assets/icons/chevronUp.svg");
+  content: url("../assets/icons/chevron-up.svg");
   @apply ml-auto h-[1.5rem] w-[1.5rem];
 }
 
diff --git a/tailwind.config.js b/tailwind.config.js
index da7d48c26..51e19691a 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -58,6 +58,7 @@ module.exports = {
         400: "#E6BDB8",
         200: "#F3DEDB",
         100: "#FBF2F0",
+        50: "#FDF8F7",
       },
       orange: {
         600: "#CE8034",
@@ -91,8 +92,8 @@ module.exports = {
     }),
     borderRadius: {
       sm: "0",
-      md: "0",
-      lg: "1.25rem",
+      md: "0.5rem", // 8px
+      lg: "1.25rem", // 20px
       full: "9999px",
     },
     fontFamily: {
diff --git a/types/search.d.ts b/types/search.d.ts
index 426e0e5f4..c7d38a92b 100644
--- a/types/search.d.ts
+++ b/types/search.d.ts
@@ -99,4 +99,9 @@ export interface SearchRequest {
   esRdfTypes?: ESRdfType[];
   sortOrder?: SearchSortOrder;
   compact?: boolean;
+  filters?: {
+    key: string;
+    property: ESType;
+    values: string[];
+  }[];
 }
diff --git a/utilities/entryscape/blocks/concept.ts b/utilities/entryscape/blocks/concept.ts
index de691d180..53f372a7c 100644
--- a/utilities/entryscape/blocks/concept.ts
+++ b/utilities/entryscape/blocks/concept.ts
@@ -2,7 +2,7 @@
 import { Entry } from "@entryscape/entrystore-js";
 import { Translate } from "next-translate";
 
-import { getSimplifiedLocalizedValue } from "@/utilities/entrystore-utils";
+import { getLocalizedValue } from "@/utilities/entrystore-utils";
 
 export const conceptBlocks = (t: Translate, iconSize: number, lang: string) => [
   {
@@ -45,7 +45,7 @@ export const conceptBlocks = (t: Translate, iconSize: number, lang: string) => [
         node.firstElementChild.appendChild(el);
 
         const ruri = entry.getResourceURI();
-        const label = getSimplifiedLocalizedValue(
+        const label = getLocalizedValue(
           entry.getAllMetadata(),
           "skos:prefLabel",
         );
diff --git a/utilities/entryscape/blocks/terminology.ts b/utilities/entryscape/blocks/terminology.ts
index 1e03ef32a..97615293b 100644
--- a/utilities/entryscape/blocks/terminology.ts
+++ b/utilities/entryscape/blocks/terminology.ts
@@ -2,7 +2,7 @@
 import { Entry } from "@entryscape/entrystore-js";
 import { Translate } from "next-translate";
 
-import { getSimplifiedLocalizedValue } from "@/utilities/entrystore-utils";
+import { getLocalizedValue } from "@/utilities/entrystore-utils";
 
 export const terminologyBlocks = (t: Translate, lang: string) => [
   {
@@ -16,7 +16,7 @@ export const terminologyBlocks = (t: Translate, lang: string) => [
         node.firstElementChild.appendChild(el);
 
         const ruri = entry.getResourceURI();
-        const label = getSimplifiedLocalizedValue(
+        const label = getLocalizedValue(
           entry.getAllMetadata(),
           "skos:prefLabel",
         );
diff --git a/utilities/entryscape/entryscape.ts b/utilities/entryscape/entryscape.ts
index 6bae689c7..e4f4436e3 100644
--- a/utilities/entryscape/entryscape.ts
+++ b/utilities/entryscape/entryscape.ts
@@ -21,11 +21,12 @@ import {
   getEntryLang,
   resourcesSearch,
   listChoices,
-  getLocalizedMetadataValue,
   getTemplateChoices,
   getLocalizedChoiceLabel,
   getUriNames,
   Choice,
+  getLocalizedValue,
+  fetchDCATMeta,
 } from "@/utilities";
 
 import { entryCache } from "../local-cache";
@@ -159,6 +160,7 @@ export class Entryscape {
           group: facetSpec.group,
           facetValues: f.values
             .filter((value: ESFacetFieldValue) => {
+              if (!value.name || value.name.trim() === "") return false;
               if (!facetSpec?.dcatFilterEnabled) return true;
 
               const choices: Choice[] = getTemplateChoices(
@@ -247,16 +249,20 @@ export class Entryscape {
    */
   async getMetaValues(
     entry: Entry,
+    path: string,
     dcat?: DCATData,
   ): Promise<{ [key: string]: string[] }> {
     const values: { [key: string]: string[] } = {};
 
-    if (entry) {
+    if (entry && path !== "/organisations/") {
       const metadata = entry.getAllMetadata();
 
       try {
-        const publisherUri = metadata.findFirstValue(null, "dcterms:publisher");
-
+        const publisherUri = getLocalizedValue(
+          metadata,
+          "dcterms:publisher",
+          entry.getResourceURI(),
+        );
         const publisherName = entryCache.getValue(publisherUri);
 
         values["organisation_literal"] = [publisherName || publisherUri];
@@ -325,6 +331,29 @@ export class Entryscape {
       values["modified"] = metadata
         .find(null, "http://purl.org/dc/terms/modified")
         .map((f: any) => f.getValue());
+    } else {
+      const metadata = entry.getAllMetadata();
+
+      try {
+        const publisherTypeUri = metadata.findFirstValue(null, "dcterms:type");
+        const dcatMeta = await fetchDCATMeta();
+
+        if (dcatMeta) {
+          const orgTypeChoices = getTemplateChoices(
+            dcatMeta,
+            "dcterms:type",
+            "adms:publishertype",
+          ).find((c: Choice) => c.value === publisherTypeUri);
+
+          if (orgTypeChoices) {
+            values["organisation_type"] = [
+              getLocalizedChoiceLabel(orgTypeChoices, this.lang),
+            ];
+          }
+        }
+      } catch (error) {
+        console.error("Error fetching organisation type:", error);
+      }
     }
 
     return values;
@@ -381,6 +410,15 @@ export class Entryscape {
     const esQuery = es.newSolrQuery();
     esQuery.publicRead(true);
 
+    // Handle filters
+    if (request.filters && request.filters.length > 0) {
+      request.filters.forEach((filter) => {
+        if (filter.property === "uri") {
+          esQuery.uriProperty(filter.key, filter.values);
+        }
+      });
+    }
+
     // Only set up facets if explicitly requested
     if (request.fetchFacets) {
       if (
@@ -496,7 +534,12 @@ export class Entryscape {
 
           if (facetSpec && facetSpec.dcatType !== "choice") {
             await getUriNames(
-              fg.values.map((v: SearchFacet) => v.name),
+              fg.values
+                .filter(
+                  (v: SearchFacet) =>
+                    v.name?.toLocaleLowerCase().startsWith("http"),
+                )
+                .map((v: SearchFacet) => v.name),
               this.getEntryStoreUtil(),
               facetSpec?.dcatProperty,
             );
@@ -528,20 +571,22 @@ export class Entryscape {
 
         const hit = {
           entryId: child.getId(),
-          title: getLocalizedMetadataValue(
+          title: getLocalizedValue(
             metaData,
             hitSpecification.titleResource || "dcterms:title",
-            lang,
-            { resourceURI },
+            resourceURI,
           ),
-          description: getLocalizedMetadataValue(
+          description: getLocalizedValue(
             metaData,
             hitSpecification.descriptionResource || "dcterms:description",
-            lang,
-            { resourceURI },
+            resourceURI,
           ),
           esEntry: child,
-          metadata: await this.getMetaValues(child, dcat),
+          metadata: await this.getMetaValues(
+            child,
+            hitSpecification.path || "",
+            dcat,
+          ),
           url: "",
           titleLang: getEntryLang(
             metaData,
diff --git a/utilities/entrystore-utils.ts b/utilities/entrystore-utils.ts
index 2709a63bd..b3fc59adc 100644
--- a/utilities/entrystore-utils.ts
+++ b/utilities/entrystore-utils.ts
@@ -21,98 +21,7 @@ import {
 import { Choice, ChoiceTemplate, DCATData } from "./dcat-utils";
 import { entryCache } from "./local-cache";
 
-export const getLocalizedMetadataValue = (
-  metadataGraph: any,
-  prop: any,
-  lang: string,
-  options?: { resourceURI?: string },
-) => {
-  let val = "";
-  const fallbackLang = "en";
-
-  const stmts = metadataGraph.find(options?.resourceURI, prop);
-  if (stmts.length > 0) {
-    const obj: any = {};
-    for (let s = 0; s < stmts.length; s++) {
-      obj[stmts[s].getLanguage() || ""] = stmts[s].getValue();
-    }
-
-    if (typeof obj[lang] !== "undefined") {
-      val = obj[lang];
-    } else if (lang === "sv" && typeof obj[fallbackLang] !== "undefined") {
-      val = obj[fallbackLang];
-    } else {
-      val = Object.entries(obj)[0][1] as string;
-    }
-  }
-
-  return val;
-};
-
-/**
- * Search graph for localized value from meta graph
- *
- * Supports uri-types (will fetch uri and display foaf:name, if any)
- * TODO: support
- *
- * value type retrieve order:
- * 1. exists in sent in lang
- * 2. exists in fallback lang (en)
- * 3. take first
- *
- * @param metadataGraph
- * @param prop
- * @param lang
- */
-export const getLocalizedValue = async (
-  metadataGraph: any,
-  prop: any,
-  lang: string,
-  es: any,
-  options: { uriTypeName?: string; resourceURI?: string } = {
-    uriTypeName: "foaf:name",
-  },
-) => {
-  let val = "";
-  const fallbackLang = "en";
-  const { uriTypeName, resourceURI } = options;
-  const stmts = metadataGraph.find(resourceURI, prop);
-  if (stmts.length > 0) {
-    const obj: any = {};
-    for (let s = 0; s < stmts.length; s++) {
-      const stType = stmts[s].getType();
-      const stValue = stmts[s].getValue();
-
-      if (stType && stType == "uri" && !stValue.includes("mailto:")) {
-        const res = await resourcesSearch([stValue], es);
-        if (res && res.length > 0) {
-          const meta = res[0].getAllMetadata();
-
-          if (meta)
-            obj[stmts[s].getLanguage() || ""] = await getLocalizedValue(
-              meta,
-              uriTypeName || "foaf:name",
-              lang,
-              es,
-              { resourceURI },
-            );
-        } else obj[stmts[s].getLanguage() || ""] = stValue;
-      } else obj[stmts[s].getLanguage() || ""] = stValue;
-    }
-
-    if (typeof obj[lang] != "undefined") {
-      val = obj[lang];
-    } else if (obj[fallbackLang] && fallbackLang != lang) {
-      val = obj[fallbackLang];
-    } else {
-      val = Object.entries(obj)[0][1] as string;
-    }
-  }
-
-  return val;
-};
-
-export const getSimplifiedLocalizedValue = (
+export const getLocalizedValue = (
   metadata: Metadata,
   property: string,
   resourceURI?: string,
@@ -134,7 +43,7 @@ export const getUriNames = async (
   const cache = entryCache.get();
   // Filter out null values and already cached URIs
   const uniqueUris = Array.from(new Set(facetValues)).filter(
-    (uri): uri is string => uri !== null && !cache.has(uri),
+    (uri): uri is string => uri !== null && uri !== "" && !cache.has(uri),
   );
 
   if (uniqueUris.length === 0) {
@@ -157,10 +66,10 @@ export const getUriNames = async (
         const metadata = entry.getMetadata();
         const uri = entry.getResourceURI();
         const name =
-          getSimplifiedLocalizedValue(metadata, "dcterms:title") ||
-          getSimplifiedLocalizedValue(metadata, "foaf:name") ||
-          getSimplifiedLocalizedValue(metadata, "skos:prefLabel") ||
-          getSimplifiedLocalizedValue(metadata, "rdfs:label") ||
+          getLocalizedValue(metadata, "dcterms:title", uri) ||
+          getLocalizedValue(metadata, "foaf:name", uri) ||
+          getLocalizedValue(metadata, "skos:prefLabel", uri) ||
+          getLocalizedValue(metadata, "rdfs:label", uri) ||
           uri;
 
         cache.set(uri, name);