diff --git a/Gemfile.lock b/Gemfile.lock
index 595477803..d980d4a40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -303,6 +303,7 @@ GEM
     google-cloud-translate-v3 (0.6.0)
       gapic-common (>= 0.17.1, < 2.a)
       google-cloud-errors (~> 1.0)
+    google-protobuf (3.22.3)
     google-protobuf (3.22.3-arm64-darwin)
     google-protobuf (3.22.3-x86_64-darwin)
     google-protobuf (3.22.3-x86_64-linux)
@@ -398,6 +399,8 @@ GEM
       launchy (>= 2.2, < 3)
     libdatadog (2.0.0.1.0)
     libdatadog (2.0.0.1.0-x86_64-linux)
+    libddwaf (1.8.2.0.0)
+      ffi (~> 1.0)
     libddwaf (1.8.2.0.0-arm64-darwin)
       ffi (~> 1.0)
     libddwaf (1.8.2.0.0-x86_64-darwin)
@@ -434,6 +437,7 @@ GEM
     mime-types-data (3.2023.0218.1)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.2)
     minitest (5.18.0)
     mock_redis (0.36.0)
       ruby2_keywords
@@ -458,6 +462,9 @@ GEM
       sidekiq
     newrelic_rpm (8.16.0)
     nio4r (2.5.9)
+    nokogiri (1.14.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.14.3-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.14.3-x86_64-darwin)
@@ -771,6 +778,7 @@ GEM
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
+  ruby
   x86_64-darwin-18
   x86_64-darwin-20
   x86_64-darwin-21
diff --git a/app/views/public/api/v1/portals/_header.html.erb b/app/views/public/api/v1/portals/_header.html.erb
index 539aa8e64..a532b9430 100644
--- a/app/views/public/api/v1/portals/_header.html.erb
+++ b/app/views/public/api/v1/portals/_header.html.erb
@@ -2,7 +2,7 @@
 <header class="bg-white mx-auto px-4 max-w-5xl w-full">
   <nav class="px-0 flex" aria-label="Top">
     <div class="w-full py-8 flex items-center">
-      <a href="/hc/<%= @portal.slug %>/<%= params[:locale] %>/" class="text-base font-semibold">
+      <a href="/hc/<%= @portal.slug %>/<%= @portal.config['default_locale'] || params[:locale] %>/" class="text-base font-semibold">
         <%= @portal.name %>
       </a>
       <% if @portal.homepage_link %>
diff --git a/app/views/public/api/v1/portals/show.html.erb b/app/views/public/api/v1/portals/show.html.erb
index a5f9f43fa..9c151333d 100644
--- a/app/views/public/api/v1/portals/show.html.erb
+++ b/app/views/public/api/v1/portals/show.html.erb
@@ -7,7 +7,7 @@
   </div>
 
   <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-32 gap-y-0 lg:gap-y-12">
-    <% if @portal.articles.where(status: :published, category_id: nil).order(position: :asc) %>
+    <% if @portal.articles.where(status: :published, category_id: nil).count > 0 %>
       <%= render "public/api/v1/portals/uncategorized-block", category: "Uncategorized", portal: @portal %>
     <% end %>
   </div>