diff --git a/public/authors/index.html b/public/authors/index.html
index 7df1b7c..ef0a37a 100755
--- a/public/authors/index.html
+++ b/public/authors/index.html
@@ -137,14 +137,14 @@
                 
               
               <li class="navigation-item">
-                <a href="/ru/authors/">🇷🇺</a>
+                <a href="/de/authors/">🇩🇪</a>
               </li>
             
           
             
               
               <li class="navigation-item">
-                <a href="/de/authors/">🇩🇪</a>
+                <a href="/ru/authors/">🇷🇺</a>
               </li>
             
           
diff --git a/public/de/sitemap.xml b/public/de/sitemap.xml
index 7e18570..5225af3 100755
--- a/public/de/sitemap.xml
+++ b/public/de/sitemap.xml
@@ -20,11 +20,6 @@
                 />
   </url><url>
     <loc>http://markinstefan.xyz/de/categories/</loc>
-    <xhtml:link
-                rel="alternate"
-                hreflang="de"
-                href="http://markinstefan.xyz/de/categories/"
-                />
     <xhtml:link
                 rel="alternate"
                 hreflang="en"
@@ -35,6 +30,11 @@
                 hreflang="ru"
                 href="http://markinstefan.xyz/ru/categories/"
                 />
+    <xhtml:link
+                rel="alternate"
+                hreflang="de"
+                href="http://markinstefan.xyz/de/categories/"
+                />
   </url><url>
     <loc>http://markinstefan.xyz/de/thank-you/</loc>
     <xhtml:link
@@ -105,11 +105,6 @@
                 />
   </url><url>
     <loc>http://markinstefan.xyz/de/series/</loc>
-    <xhtml:link
-                rel="alternate"
-                hreflang="de"
-                href="http://markinstefan.xyz/de/series/"
-                />
     <xhtml:link
                 rel="alternate"
                 hreflang="en"
@@ -120,13 +115,13 @@
                 hreflang="ru"
                 href="http://markinstefan.xyz/ru/series/"
                 />
-  </url><url>
-    <loc>http://markinstefan.xyz/de/tags/</loc>
     <xhtml:link
                 rel="alternate"
-                hreflang="ru"
-                href="http://markinstefan.xyz/ru/tags/"
+                hreflang="de"
+                href="http://markinstefan.xyz/de/series/"
                 />
+  </url><url>
+    <loc>http://markinstefan.xyz/de/tags/</loc>
     <xhtml:link
                 rel="alternate"
                 hreflang="de"
@@ -137,6 +132,11 @@
                 hreflang="en"
                 href="http://markinstefan.xyz/tags/"
                 />
+    <xhtml:link
+                rel="alternate"
+                hreflang="ru"
+                href="http://markinstefan.xyz/ru/tags/"
+                />
   </url><url>
     <loc>http://markinstefan.xyz/de/about/</loc>
     <xhtml:link
diff --git a/public/de/tags/index.html b/public/de/tags/index.html
index bf1cbfb..34db05d 100755
--- a/public/de/tags/index.html
+++ b/public/de/tags/index.html
@@ -137,14 +137,14 @@
                 
               
               <li class="navigation-item">
-                <a href="/ru/tags/">🇷🇺</a>
+                <a href="/tags/">🇬🇧</a>
               </li>
             
           
             
               
               <li class="navigation-item">
-                <a href="/tags/">🇬🇧</a>
+                <a href="/ru/tags/">🇷🇺</a>
               </li>
             
           
diff --git a/public/en/sitemap.xml b/public/en/sitemap.xml
index 6b04392..e96ea74 100755
--- a/public/en/sitemap.xml
+++ b/public/en/sitemap.xml
@@ -3,6 +3,11 @@
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <url>
     <loc>http://markinstefan.xyz/authors/</loc>
+    <xhtml:link
+                rel="alternate"
+                hreflang="de"
+                href="http://markinstefan.xyz/de/authors/"
+                />
     <xhtml:link
                 rel="alternate"
                 hreflang="en"
@@ -13,11 +18,6 @@
                 hreflang="ru"
                 href="http://markinstefan.xyz/ru/authors/"
                 />
-    <xhtml:link
-                rel="alternate"
-                hreflang="de"
-                href="http://markinstefan.xyz/de/authors/"
-                />
   </url><url>
     <loc>http://markinstefan.xyz/categories/</loc>
     <xhtml:link
diff --git a/public/rsvp-submit.php b/public/rsvp-submit.php
index 688e760..844749c 100755
--- a/public/rsvp-submit.php
+++ b/public/rsvp-submit.php
@@ -215,10 +215,13 @@ if (!in_array($lang, $allowedLangs, true)) {
     $lang = 'en';
 }
 
-header("Location: /{$lang}/thank-you/");
-exit;
+if ($lang === 'en') {
     header('Location: /thank-you/');
-    exit;
+} else {
+    header("Location: /{$lang}/thank-you/");
+}
+
+exit;
 
 } catch (Exception $e) {
 
diff --git a/public/ru/sitemap.xml b/public/ru/sitemap.xml
index 8e701c6..723cba1 100755
--- a/public/ru/sitemap.xml
+++ b/public/ru/sitemap.xml
@@ -3,11 +3,6 @@
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <url>
     <loc>http://markinstefan.xyz/ru/authors/</loc>
-    <xhtml:link
-                rel="alternate"
-                hreflang="ru"
-                href="http://markinstefan.xyz/ru/authors/"
-                />
     <xhtml:link
                 rel="alternate"
                 hreflang="de"
@@ -18,6 +13,11 @@
                 hreflang="en"
                 href="http://markinstefan.xyz/authors/"
                 />
+    <xhtml:link
+                rel="alternate"
+                hreflang="ru"
+                href="http://markinstefan.xyz/ru/authors/"
+                />
   </url><url>
     <loc>http://markinstefan.xyz/ru/categories/</loc>
     <xhtml:link
diff --git a/static/rsvp-submit.php b/static/rsvp-submit.php
index 688e760..844749c 100755
--- a/static/rsvp-submit.php
+++ b/static/rsvp-submit.php
@@ -215,10 +215,13 @@ if (!in_array($lang, $allowedLangs, true)) {
     $lang = 'en';
 }
 
-header("Location: /{$lang}/thank-you/");
-exit;
+if ($lang === 'en') {
     header('Location: /thank-you/');
-    exit;
+} else {
+    header("Location: /{$lang}/thank-you/");
+}
+
+exit;
 
 } catch (Exception $e) {