diff --git a/angular-hub/src/app/pages/communities/index.page.ts b/angular-hub/src/app/pages/communities/index.page.ts
index 7619f7a3..609405b0 100644
--- a/angular-hub/src/app/pages/communities/index.page.ts
+++ b/angular-hub/src/app/pages/communities/index.page.ts
@@ -50,11 +50,11 @@ export const routeMeta: RouteMeta = {
           <app-community-card [community]="community"></app-community-card>
         </li>
       } @empty {
-        <p class="col-span-2">
-          No event matching the filter
+        <p class="col-span-full">
+          No event matching the filter:
 
           @if (selectedCountry()) {
-            {{ selectedCountry() }}
+            <span>{{ selectedCountry() }}</span>
           }
         </p>
       }
diff --git a/angular-hub/src/app/pages/index.page.ts b/angular-hub/src/app/pages/index.page.ts
index ee18ad43..1eeac2c3 100644
--- a/angular-hub/src/app/pages/index.page.ts
+++ b/angular-hub/src/app/pages/index.page.ts
@@ -75,15 +75,26 @@ export const routeMeta: RouteMeta = {
           <app-event-card [event]="event"></app-event-card>
         </li>
       } @empty {
-        <p class="col-span-2">
-          No event matching the filter
-          @if (date()) {
-            {{ date() | date: 'MM/DD/YYYY' }}
-          }
+        <p class="col-span-full">
+          No event matching filter(s):
 
-          @if (selectedLanguage()) {
-            {{ selectedLanguage() }}
-          }
+          <span>
+            @if (date()) {
+              {{ date() | date: 'dd MMM YYYY' }}
+            }
+
+            @if (selectedLanguage()) {
+              @if (isRemote()) {
+                , {{ selectedLanguage() }}
+              } @else {
+                and {{ selectedLanguage() }}
+              }
+            }
+
+            @if (isRemote()) {
+              and Remote Only
+            }
+          </span>
         </p>
       }
     </ul>