diff --git a/src/fetch.ts b/src/fetch.ts
index 02aa9be..1804472 100644
--- a/src/fetch.ts
+++ b/src/fetch.ts
@@ -256,8 +256,7 @@ export const fetchConversation = async (
       })
     )}&fieldToggles=${encodeURIComponent(
       JSON.stringify({
-        // TODO Figure out what this property does
-        withArticleRichContentState: false
+        withArticleRichContentState: true
       })
     )}`,
     event,
diff --git a/src/server.ts b/src/server.ts
index 226f9b2..3902200 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -25,7 +25,7 @@ const statusRequest = async (
   /* Let's return our HTML version for wayback machine (we can add other archivers too in future) */
   if (
     ['archive.org', 'Wayback Machine'].some(service =>
-      request.headers.get('Via').includes(service)
+      request.headers.get('Via')?.includes?.(service)
     )
   ) {
     console.log('Request from archive.org');