diff --git a/app/charts/map/map-custom-layers-legend.spec.tsx b/app/charts/map/map-custom-layers-legend.spec.tsx
new file mode 100644
index 000000000..6a542a6fd
--- /dev/null
+++ b/app/charts/map/map-custom-layers-legend.spec.tsx
@@ -0,0 +1,19 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, it } from "vitest";
+
+import { CustomLayerDescription } from "@/charts/map/map-custom-layers-legend";
+
+afterEach(cleanup);
+
+describe("CustomLayerDescription", () => {
+  it("renders WMS layer descriptions as text", () => {
+    const description = '<img src="x" onerror="alert(document.domain)">';
+
+    const { container } = render(
+      <CustomLayerDescription description={description} />
+    );
+
+    expect(screen.getByText(description)).toBeTruthy();
+    expect(container.querySelector("img")).toBeNull();
+  });
+});
diff --git a/app/charts/map/map-custom-layers-legend.tsx b/app/charts/map/map-custom-layers-legend.tsx
index 39cdce5ec..5c9564d64 100644
--- a/app/charts/map/map-custom-layers-legend.tsx
+++ b/app/charts/map/map-custom-layers-legend.tsx
@@ -1,4 +1,4 @@
-import { Box, Typography, useTheme } from "@mui/material";
+import { Box, Typography } from "@mui/material";
 import uniq from "lodash/uniq";
 import NextImage from "next/image";
 
@@ -43,6 +43,12 @@ const constrainSize = ({
   return { width, height };
 };
 
+export const CustomLayerDescription = ({
+  description,
+}: {
+  description: string;
+}) => <Box>{description}</Box>;
+
 export const MapCustomLayersLegend = ({
   chartConfig,
   value,
@@ -52,7 +58,6 @@ export const MapCustomLayersLegend = ({
 }) => {
   const customLayers = chartConfig.baseLayer.customLayers;
   const { data: legendsData, error } = useLegendsData({ customLayers });
-  const theme = useTheme();
   return error ? (
     <Error>{error.message}</Error>
   ) : !legendsData ? (
@@ -99,15 +104,7 @@ export const MapCustomLayersLegend = ({
                 {layer.description ? (
                   <InfoIconTooltip
                     title={
-                      <Box
-                        sx={{
-                          "& > *": {
-                            // We do not let the tooltip HTML override the font size
-                            fontSize: `${theme.typography.caption.fontSize} !important`,
-                          },
-                        }}
-                        dangerouslySetInnerHTML={{ __html: layer.description }}
-                      />
+                      <CustomLayerDescription description={layer.description} />
                     }
                     sx={{ width: "fit-content" }}
                   />
diff --git a/app/components/dataset-metadata.spec.tsx b/app/components/dataset-metadata.spec.tsx
new file mode 100644
index 000000000..7d1c3f3c6
--- /dev/null
+++ b/app/components/dataset-metadata.spec.tsx
@@ -0,0 +1,45 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, it } from "vitest";
+
+import { DatasetPublisher } from "@/components/dataset-metadata";
+
+afterEach(cleanup);
+
+describe("DatasetPublisher", () => {
+  it("renders publisher anchor markup as a safe link", () => {
+    render(
+      <DatasetPublisher
+        publisher={
+          '<a href="https://example.com/?a=1&amp;b=2">FOEN &amp; BAFU</a>'
+        }
+      />
+    );
+
+    const link = screen.getByRole("link", { name: "FOEN & BAFU" });
+    expect(link.getAttribute("href")).toBe("https://example.com/?a=1&b=2");
+    expect(link.getAttribute("target")).toBe("_blank");
+    expect(link.getAttribute("rel")).toBe("noopener noreferrer");
+  });
+
+  it("does not render unsafe publisher URLs as links", () => {
+    const { container } = render(
+      <DatasetPublisher
+        publisher={'<a href="javascript:alert(1)">Publisher</a>'}
+      />
+    );
+
+    expect(screen.getByText("Publisher")).toBeTruthy();
+    expect(container.querySelector("a")).toBeNull();
+  });
+
+  it("renders plain text and strips unexpected markup", () => {
+    const { container } = render(
+      <DatasetPublisher
+        publisher={'Publisher <img src="x" onerror="alert(1)"> &amp; Office'}
+      />
+    );
+
+    expect(container.textContent).toBe("Publisher  & Office");
+    expect(container.querySelector("img")).toBeNull();
+  });
+});
diff --git a/app/components/dataset-metadata.tsx b/app/components/dataset-metadata.tsx
index d42c2ab50..ddab536a9 100644
--- a/app/components/dataset-metadata.tsx
+++ b/app/components/dataset-metadata.tsx
@@ -1,7 +1,6 @@
 import { sanitizeUrl } from "@braintree/sanitize-url";
 import { Trans } from "@lingui/macro";
 import {
-  Box,
   Link,
   Link as MUILink,
   LinkProps,
@@ -54,13 +53,7 @@ export const DatasetMetadata = ({
               <Trans id="dataset.metadata.source">Source</Trans>
             </DatasetMetadataTitle>
             <DatasetMetadataBody>
-              <Box
-                component="span"
-                sx={{ "> a": { color: "grey.900" } }}
-                dangerouslySetInnerHTML={{
-                  __html: cube.publisher,
-                }}
-              />
+              <DatasetPublisher publisher={cube.publisher} />
             </DatasetMetadataBody>
           </div>
         )}
@@ -173,6 +166,67 @@ const DatasetMetadataBody = ({
   </Typography>
 );
 
+export const DatasetPublisher = ({ publisher }: { publisher: string }) => {
+  const { text, href } = parsePublisher(publisher);
+
+  return href ? (
+    <Link
+      href={href}
+      target="_blank"
+      rel="noopener noreferrer"
+      underline="hover"
+      sx={{ color: "grey.900" }}
+    >
+      {text}
+    </Link>
+  ) : (
+    <>{text}</>
+  );
+};
+
+const decodeHtmlEntities = (text: string) => {
+  const namedEntities: Record<string, string> = {
+    amp: "&",
+    apos: "'",
+    gt: ">",
+    lt: "<",
+    quot: '"',
+  };
+
+  return text.replace(/&(#(?:x[\da-f]+|\d+)|[a-z]+);/gi, (entity, code) => {
+    if (code[0] !== "#") {
+      return namedEntities[code.toLowerCase()] ?? entity;
+    }
+
+    const value =
+      code[1].toLowerCase() === "x"
+        ? parseInt(code.slice(2), 16)
+        : parseInt(code.slice(1), 10);
+    return Number.isSafeInteger(value) && value >= 0 && value <= 0x10ffff
+      ? String.fromCodePoint(value)
+      : entity;
+  });
+};
+
+const publisherText = (publisher: string) => {
+  return decodeHtmlEntities(publisher.replace(/<[^>]+>/g, ""));
+};
+
+const parsePublisher = (publisher: string): { text: string; href?: string } => {
+  const match = publisher.match(
+    /<a[^>]+href=["']([^"']+)["'][^>]*>(.*?)<\/a>/is
+  );
+
+  if (match) {
+    const href = sanitizeUrl(decodeHtmlEntities(match[1]));
+    const text = publisherText(match[2]);
+
+    return href !== "about:blank" ? { text, href } : { text };
+  }
+
+  return { text: publisherText(publisher) };
+};
+
 const DatasetMetadataLink = ({
   href,
   label,
diff --git a/app/components/debug-search.tsx b/app/components/debug-search.tsx
index 1ab7d5433..3c9c27b16 100644
--- a/app/components/debug-search.tsx
+++ b/app/components/debug-search.tsx
@@ -10,10 +10,7 @@ import TextField from "@mui/material/TextField";
 import Typography from "@mui/material/Typography";
 import { KeyboardEventHandler, useEffect, useRef, useState } from "react";
 
-import {
-  SearchCubeFilter,
-  useSearchCubesQuery,
-} from "@/graphql/query-hooks";
+import { SearchCubeFilter, useSearchCubesQuery } from "@/graphql/query-hooks";
 import { RequestQueryMeta } from "@/graphql/query-meta";
 import { SearchCubeFilterType } from "@/graphql/resolver-types";
 
@@ -133,7 +130,7 @@ const Search = ({
                 <Typography
                   variant="caption"
                   dangerouslySetInnerHTML={{
-                    __html: highlightedDescription?.slice(0, 100) ?? "" + "...",
+                    __html: `${highlightedDescription?.slice(0, 100) ?? ""}...`,
                   }}
                 />
                 <br />
diff --git a/app/middleware.ts b/app/middleware.ts
index 6ae9db30c..3327585e3 100644
--- a/app/middleware.ts
+++ b/app/middleware.ts
@@ -32,7 +32,7 @@ function buildCSP(frameAncestors: string): string {
 
   return [
     `default-src 'self' 'unsafe-inline'${unsafeEval}${sentryCSP}${vercelDefault}`,
-    `script-src 'self' 'unsafe-inline'${unsafeEval}${sentryCSP}${vercelScript} https://api.mapbox.com https://api.maptiler.com`,
+    `script-src 'self'${unsafeEval}${sentryCSP}${vercelScript} https://api.mapbox.com https://api.maptiler.com`,
     `script-src-elem 'self' 'unsafe-inline' https://*.admin.ch https://visualize.admin.ch https://*.visualize.admin.ch${vercelScriptElem} https://api.mapbox.com`,
     `style-src 'self' 'unsafe-inline' https://fonts.googleapis.com`,
     `font-src 'self'`,
diff --git a/app/rdf/query-search-score-utils.spec.ts b/app/rdf/query-search-score-utils.spec.ts
index 90d319412..e1ca4eccf 100644
--- a/app/rdf/query-search-score-utils.spec.ts
+++ b/app/rdf/query-search-score-utils.spec.ts
@@ -22,4 +22,29 @@ describe("highlighting search words in query", () => {
       expect(result).toEqual(t[2]);
     }
   });
+
+  it("should escape HTML contained in the text", () => {
+    expect(highlight('<img src=x onerror="alert(1)"> bad', "bad")).toEqual(
+      "&lt;img src=x onerror=&quot;alert(1)&quot;&gt; <b>bad</b>"
+    );
+  });
+
+  it("should escape HTML contained in the matched part", () => {
+    expect(highlight("<script>alert(1)</script>", "<script>")).toEqual(
+      "<b>&lt;script&gt;</b>alert(1)&lt;/script&gt;"
+    );
+  });
+
+  it("should treat regex special characters in the query literally", () => {
+    expect(highlight("Report about C++ usage", "C++")).toEqual(
+      "Report about <b>C++</b> usage"
+    );
+    expect(highlight("Pollution is bad", "(")).toEqual("Pollution is bad");
+  });
+
+  it("should not highlight empty matches for queries with extra spaces", () => {
+    expect(highlight("Pollution is bad", "is  bad")).toEqual(
+      "Pollution <b>is</b> <b>bad</b>"
+    );
+  });
 });
diff --git a/app/rdf/query-search-score-utils.ts b/app/rdf/query-search-score-utils.ts
index b1486cc4e..244c6f3ce 100644
--- a/app/rdf/query-search-score-utils.ts
+++ b/app/rdf/query-search-score-utils.ts
@@ -84,7 +84,44 @@ export const computeScores = (
   return infoPerCube;
 };
 
+const escapeHtml = (text: string) => {
+  return text
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&#39;");
+};
+
+const escapeRegExp = (text: string) => {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+};
+
+/**
+ * Wraps the parts of `text` matching `query` in `<b>` tags.
+ *
+ * The text comes from remote cube metadata and the query from user input, so both
+ * are escaped: the text as HTML, since the result is rendered as markup, and the
+ * query as a regular expression, so that special characters (e.g. "C++") are
+ * matched literally instead of throwing or matching unexpectedly.
+ */
 export const highlight = (text: string, query: string) => {
-  const re = new RegExp(query.toLowerCase().split(" ").join("|"), "gi");
-  return text.replace(re, (m) => `<b>${m}</b>`);
+  const tokens = query
+    .split(" ")
+    .filter((d) => d !== "")
+    .map((d) => escapeRegExp(d));
+
+  if (!tokens.length) {
+    return escapeHtml(text);
+  }
+
+  const re = new RegExp(`(${tokens.join("|")})`, "gi");
+
+  // Odd indices contain the captured matches.
+  return text
+    .split(re)
+    .map((part, i) =>
+      i % 2 === 1 ? `<b>${escapeHtml(part)}</b>` : escapeHtml(part)
+    )
+    .join("");
 };
diff --git a/yarn.lock b/yarn.lock
index 2b0881ab4..d33df08dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13354,32 +13354,11 @@ hast-util-from-parse5@^6.0.0:
     vfile-location "^3.2.0"
     web-namespaces "^1.0.0"
 
-hast-util-from-parse5@^8.0.0:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-8.0.2.tgz#29b42758ba96535fd6021f0f533c000886c0f00f"
-  integrity sha512-SfMzfdAi/zAoZ1KkFEyyeXBn7u/ShQrfd675ZEE9M3qj+PMFX05xubzRyF76CCSJu8au9jgVxDV1+okFvgZU4A==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    "@types/unist" "^3.0.0"
-    devlop "^1.0.0"
-    hastscript "^9.0.0"
-    property-information "^6.0.0"
-    vfile "^6.0.0"
-    vfile-location "^5.0.0"
-    web-namespaces "^2.0.0"
-
 hast-util-parse-selector@^2.0.0:
   version "2.2.5"
   resolved "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz"
   integrity sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==
 
-hast-util-parse-selector@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz#352879fa86e25616036037dd8931fb5f34cb4a27"
-  integrity sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==
-  dependencies:
-    "@types/hast" "^3.0.0"
-
 hast-util-raw@6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.1.tgz"
@@ -13396,25 +13375,6 @@ hast-util-raw@6.0.1:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
-hast-util-raw@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-9.1.0.tgz#79b66b26f6f68fb50dfb4716b2cdca90d92adf2e"
-  integrity sha512-Y8/SBAHkZGoNkpzqqfCldijcuUKh7/su31kEBp67cFY09Wy0mTRgtsLYsiIxMJxlu0f6AA5SUTbDR8K0rxnbUw==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    "@types/unist" "^3.0.0"
-    "@ungap/structured-clone" "^1.0.0"
-    hast-util-from-parse5 "^8.0.0"
-    hast-util-to-parse5 "^8.0.0"
-    html-void-elements "^3.0.0"
-    mdast-util-to-hast "^13.0.0"
-    parse5 "^7.0.0"
-    unist-util-position "^5.0.0"
-    unist-util-visit "^5.0.0"
-    vfile "^6.0.0"
-    web-namespaces "^2.0.0"
-    zwitch "^2.0.0"
-
 hast-util-sanitize@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-5.0.2.tgz#edb260d94e5bba2030eb9375790a8753e5bf391f"
@@ -13456,19 +13416,6 @@ hast-util-to-parse5@^6.0.0:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
-hast-util-to-parse5@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-8.0.0.tgz#477cd42d278d4f036bc2ea58586130f6f39ee6ed"
-  integrity sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    comma-separated-tokens "^2.0.0"
-    devlop "^1.0.0"
-    property-information "^6.0.0"
-    space-separated-tokens "^2.0.0"
-    web-namespaces "^2.0.0"
-    zwitch "^2.0.0"
-
 hast-util-whitespace@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz#7778ed9d3c92dd9e8c5c8f648a49c21fc51cb621"
@@ -13487,17 +13434,6 @@ hastscript@^6.0.0:
     property-information "^5.0.0"
     space-separated-tokens "^1.0.0"
 
-hastscript@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-9.0.0.tgz#2b76b9aa3cba8bf6d5280869f6f6f7165c230763"
-  integrity sha512-jzaLBGavEDKHrc5EfFImKN7nZKKBdSLIdGvCwDZ9TfzbF2ffXiov8CKE445L2Z1Ek2t/m4SKQ2j6Ipv7NyUolw==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    comma-separated-tokens "^2.0.0"
-    hast-util-parse-selector "^4.0.0"
-    property-information "^6.0.0"
-    space-separated-tokens "^2.0.0"
-
 he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -13592,11 +13528,6 @@ html-void-elements@^1.0.0:
   resolved "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz"
   integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==
 
-html-void-elements@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-3.0.0.tgz#fc9dbd84af9e747249034d4d62602def6517f1d7"
-  integrity sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==
-
 html-webpack-plugin@^5.5.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
@@ -17124,7 +17055,7 @@ parse5@^6.0.0:
   resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parse5@^7.0.0, parse5@^7.2.1:
+parse5@^7.2.1:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05"
   integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==
@@ -18447,15 +18378,6 @@ rehackt@^0.1.0:
   resolved "https://registry.yarnpkg.com/rehackt/-/rehackt-0.1.0.tgz#a7c5e289c87345f70da8728a7eb878e5d03c696b"
   integrity sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==
 
-rehype-raw@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-7.0.0.tgz#59d7348fd5dbef3807bbaa1d443efd2dd85ecee4"
-  integrity sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    hast-util-raw "^9.0.0"
-    vfile "^6.0.0"
-
 rehype-sanitize@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/rehype-sanitize/-/rehype-sanitize-6.0.0.tgz#16e95f4a67a69cbf0f79e113c8e0df48203db73c"
@@ -21001,14 +20923,6 @@ vfile-location@^3.0.0, vfile-location@^3.2.0:
   resolved "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz"
   integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==
 
-vfile-location@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-5.0.3.tgz#cb9eacd20f2b6426d19451e0eafa3d0a846225c3"
-  integrity sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    vfile "^6.0.0"
-
 vfile-message@^2.0.0:
   version "2.0.4"
   resolved "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz"
@@ -21153,11 +21067,6 @@ web-namespaces@^1.0.0:
   resolved "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz"
   integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==
 
-web-namespaces@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.1.tgz#1010ff7c650eccb2592cebeeaf9a1b253fd40692"
-  integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==
-
 web-streams-polyfill@^3.0.3:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"