diff --git a/pages/components/Profile/Contact.js b/pages/components/Profile/Contact.js
index f9ace53..5103af2 100644
--- a/pages/components/Profile/Contact.js
+++ b/pages/components/Profile/Contact.js
@@ -8,7 +8,7 @@ const Contact = (props) => {
     const { icon, dest, caption } = props
     return (
         <div className="hover:underline">
-            <Link href={{ pathname: dest, query: query }}>
+            <Link href={{ pathname: dest }}>
                 <a>
                     <FontAwesomeIcon icon={icon} className="w-7 h-7 inline lg:w-10 lg:h-10 md:w-7 md:h-7"/>
                     <p className="font-mono text-xl">{caption}</p>
diff --git a/pages/hcunews.js b/pages/hcunews.js
index 5d6b5ab..d7bcd54 100644
--- a/pages/hcunews.js
+++ b/pages/hcunews.js
@@ -17,20 +17,24 @@ export default function HcuNews() {
     const { t } = useTranslation();
     const [query] = useLanguageQuery();
 
-    return(
-        <Layout title={t('hcunews')}>
-        <div>
-            <h1>{t('hcunews')}</h1>
-            {lang === 'ja' ? (
-                <ReactMarkdown plugins={[gfm]}>
-                    {ja}
-                </ReactMarkdown>
-            ) : (
-                <ReactMarkdown plugins={[gfm]}>
-                    {en}
-                </ReactMarkdown>
-            )}
-        </div>
-        </Layout>
-    )
-    }
\ No newline at end of file
+    if (!query) {
+        return <p>Loading...</p>
+    } else {
+        return (
+            <Layout title={t('hcunews')}>
+            <div>
+                <h1>{t('hcunews')}</h1>
+                {query["lang"] === 'ja' ? (
+                    <ReactMarkdown plugins={[gfm]}>
+                        {ja}
+                    </ReactMarkdown>
+                ) : (
+                    <ReactMarkdown plugins={[gfm]}>
+                        {en}
+                    </ReactMarkdown>
+                )}
+            </div>
+            </Layout>
+        )
+    }
+}
\ No newline at end of file
diff --git a/pages/tos.js b/pages/tos.js
index dd76e6e..7a1be9b 100644
--- a/pages/tos.js
+++ b/pages/tos.js
@@ -17,20 +17,24 @@ import en from '../docs/tos/en.md'
 export default function Tos(props) {
     const { t } = useTranslation();
     const [query] = useLanguageQuery();
-  
-    return(
-        <Layout title={t('tos')}>
-        <div>
-          {lang === 'ja' ? (
-            <ReactMarkdown plugins={[gfm]}>
-                {ja}
-            </ReactMarkdown>
-          ) : (
-            <ReactMarkdown plugins={[gfm]}>
-                {en}
-            </ReactMarkdown>
-          )}
-        </div>
-        </Layout>
-        )
-    }
\ No newline at end of file
+    
+    if (!query) {
+      return <p>Loading...</p>
+    } else {
+      return (
+          <Layout title={t('tos')}>
+          <div>
+            {query["lang"] === 'ja' ? (
+              <ReactMarkdown plugins={[gfm]}>
+                  {ja}
+              </ReactMarkdown>
+            ) : (
+              <ReactMarkdown plugins={[gfm]}>
+                  {en}
+              </ReactMarkdown>
+            )}
+          </div>
+          </Layout>
+          )
+    }
+  }
\ No newline at end of file