diff --git a/docs/user/src/components/GiscusComponent.tsx b/docs/user/src/components/GiscusComponent.tsx
index 41f8e18..f3a88a5 100644
--- a/docs/user/src/components/GiscusComponent.tsx
+++ b/docs/user/src/components/GiscusComponent.tsx
@@ -11,8 +11,8 @@ export default function GiscusComponent() {
       repoId="R_kgDOObwUag"
       category="General"
       categoryId="DIC_kwDOObwUas4CzVw_"
-      mapping="pathname"
-      strict="0"
+      mapping="og:title"
+      strict="1"
       reactionsEnabled="1"
       emitMetadata="0"
       inputPosition="top"
diff --git a/docs/user/src/theme/DocItem/Footer/index.tsx b/docs/user/src/theme/DocItem/Footer/index.tsx
index 1a3052f..0e36812 100644
--- a/docs/user/src/theme/DocItem/Footer/index.tsx
+++ b/docs/user/src/theme/DocItem/Footer/index.tsx
@@ -14,6 +14,21 @@ export default function DocItemFooterWrapper(props) {
       <DocItemFooter {...props} />
       {enableComments && (
         <div style={{ marginTop: '3rem' }}>
+          <p style={{
+            fontSize: '0.85rem',
+            color: 'var(--ifm-color-emphasis-600)',
+            marginBottom: '0.75rem',
+          }}>
+            💬 <strong>Comments are page-specific.</strong> For a new question or idea,{' '}
+            <a
+              href="https://github.com/jpawlowski/hass.tibber_prices/discussions/new/choose"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              open a dedicated Discussion on GitHub
+            </a>{' '}
+            so it gets its own thread and proper visibility.
+          </p>
           <GiscusComponent />
         </div>
       )}