diff --git a/plugins/bedard/blogtags/components/BlogTags.php b/plugins/bedard/blogtags/components/BlogTags.php
index ac880c46a..639007f0d 100644
--- a/plugins/bedard/blogtags/components/BlogTags.php
+++ b/plugins/bedard/blogtags/components/BlogTags.php
@@ -3,6 +3,7 @@
 use Bedard\BlogTags\Models\Tag;
 use Cms\Classes\ComponentBase;
 use DB;
+use Illuminate\Support\Facades\App;
 
 class BlogTags extends ComponentBase
 {
@@ -81,7 +82,7 @@ class BlogTags extends ComponentBase
     public function onRun()
     {
         // Start building the tags query
-        $query = Tag::with('posts');
+        $query = Tag::where('locale',App::getLocale());
 
         // Hide orphans
         if ($this->property('hideOrphans'))
@@ -101,5 +102,6 @@ class BlogTags extends ComponentBase
             $query->take($take);
 
         $this->tags = $query->get();
+
     }
 }
diff --git a/themes/modern/pages/search.htm b/themes/modern/pages/search.htm
index 06556accb..2b95e0882 100644
--- a/themes/modern/pages/search.htm
+++ b/themes/modern/pages/search.htm
@@ -13,8 +13,8 @@ pageNumber = "{{ :page }}"
 postsPerPage = 10
 noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
-categoryPage = "blog/category"
-postPage = "blog/post"
+categoryPage = "category"
+postPage = "post"
 ==
 <div class="main__content">
     <div class="heading">