diff --git a/app/services/forums_linkbuilder_service.rb b/app/services/forums_linkbuilder_service.rb
index 7d234c9b..44748a6f 100644
--- a/app/services/forums_linkbuilder_service.rb
+++ b/app/services/forums_linkbuilder_service.rb
@@ -1,6 +1,6 @@
 class ForumsLinkbuilderService < Service
   def self.worldbuilding_url(page_type)
-    self.content_to_url_map.fetch(page_type, nil)
+    self.content_to_url_map.fetch(page_type.name.to_sym, nil)
   end
 
   def self.content_to_url_map
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
index 59c6d50c..d0726e7c 100644
--- a/app/views/layouts/_navbar.html.erb
+++ b/app/views/layouts/_navbar.html.erb
@@ -48,7 +48,7 @@
         <ul class="tabs tabs-transparent">
           <% @navbar_actions.each do |action| %>
             <li class="tab">
-              <a class="white-text <%= 'active' if action[:href] == request.env['PATH_INFO'] %>" href="<%= action[:href] %>" target="<%= action[:target] || '_self' %>">
+              <a class="white-text <%= 'active' if action[:href] == request.env['REQUEST_PATH'] %>" href="<%= action[:href] %>" target="<%= action[:target] || '_self' %>">
                 <%= action[:label] %>
               </a>
             </li>