diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 983e6c24..6df17d57 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @dessalines
+* @dessalines @SleeplessOne1917
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 7cf2f08a..9cff2c7f 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -256,6 +256,10 @@ hr {
   text-overflow: ellipsis;
 }
 
+.text-xs-center {
+  text-align: center;
+}
+
 .overflow-wrap-anywhere {
   overflow-wrap: anywhere;
 }
diff --git a/src/shared/components/community/sidebar.tsx b/src/shared/components/community/sidebar.tsx
index 8b235595..c7b10466 100644
--- a/src/shared/components/community/sidebar.tsx
+++ b/src/shared/components/community/sidebar.tsx
@@ -262,7 +262,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
         <li className="list-inline-item">
           <Link
             className="badge badge-primary"
-            to={`/modlog/community/${this.props.community_view.community.id}`}
+            to={`/modlog/${this.props.community_view.community.id}`}
           >
             {i18n.t("modlog")}
           </Link>
diff --git a/src/shared/components/modlog.tsx b/src/shared/components/modlog.tsx
index af717fc5..8972f985 100644
--- a/src/shared/components/modlog.tsx
+++ b/src/shared/components/modlog.tsx
@@ -1,5 +1,6 @@
 import { NoOptionI18nKeys } from "i18next";
 import { Component, linkEvent } from "inferno";
+import { T } from "inferno-i18next-dess";
 import { Link } from "inferno-router";
 import { RouteComponentProps } from "inferno-router/dist/Route";
 import {
@@ -57,7 +58,7 @@ import {
   wsSubscribe,
 } from "../utils";
 import { HtmlTags } from "./common/html-tags";
-import { Spinner } from "./common/icon";
+import { Icon, Spinner } from "./common/icon";
 import { MomentTime } from "./common/moment-time";
 import { Paginator } from "./common/paginator";
 import { SearchableSelect } from "./common/searchable-select";
@@ -782,6 +783,19 @@ export class Modlog extends Component<
         />
 
         <div>
+          <div
+            className="alert alert-warning text-sm-start text-xs-center"
+            role="alert"
+          >
+            <Icon
+              icon="alert-triangle"
+              inline
+              classes="mr-sm-2 mx-auto d-sm-inline d-block"
+            />
+            <T i18nKey="modlog_content_warning" class="d-inline">
+              #<strong>#</strong>#
+            </T>
+          </div>
           <h5>
             {communityName && (
               <Link className="text-body" to={`/c/${communityName}`}>
diff --git a/src/shared/components/search.tsx b/src/shared/components/search.tsx
index 53b56e8f..946dd6ab 100644
--- a/src/shared/components/search.tsx
+++ b/src/shared/components/search.tsx
@@ -423,7 +423,9 @@ export class Search extends Component<any, SearchState> {
         {this.selects}
         {this.searchForm}
         {this.displayResults(type)}
-        {this.resultsCount === 0 && <span>{i18n.t("no_results")}</span>}
+        {this.resultsCount === 0 && !this.state.searchLoading && (
+          <span>{i18n.t("no_results")}</span>
+        )}
         <Paginator page={page} onChange={this.handlePageChange} />
       </div>
     );
@@ -1002,7 +1004,7 @@ export class Search extends Component<any, SearchState> {
   }
 
   checkFinishedLoading() {
-    if (this.state.searchResponse && this.state.resolveObjectResponse) {
+    if (this.state.searchResponse || this.state.resolveObjectResponse) {
       this.setState({ searchLoading: false });
     }
   }
diff --git a/src/shared/routes.ts b/src/shared/routes.ts
index 875ba502..ddaa8740 100644
--- a/src/shared/routes.ts
+++ b/src/shared/routes.ts
@@ -92,12 +92,12 @@ export const routes: IRoutePropsWithFetch[] = [
     component: Settings,
   },
   {
-    path: `/modlog`,
+    path: `/modlog/:communityId`,
     component: Modlog,
     fetchInitialData: Modlog.fetchInitialData,
   },
   {
-    path: `/modlog/:communityId`,
+    path: `/modlog`,
     component: Modlog,
     fetchInitialData: Modlog.fetchInitialData,
   },