diff --git a/resources/views/components/layouts/app/sidebar.blade.php b/resources/views/components/layouts/app/sidebar.blade.php
index 4431d42..ae0a622 100644
--- a/resources/views/components/layouts/app/sidebar.blade.php
+++ b/resources/views/components/layouts/app/sidebar.blade.php
@@ -66,14 +66,24 @@
             <flux:navlist.item icon="academic-cap" :href="route_with_country('courses.index')"
                                :current="request()->routeIs('courses.index')"
                                wire:navigate
-                               badge="{{ \App\Models\Course::query()->count() }}">
-                {{ __('Kurse') }}
+                               badge="{{ \App\Models\Course::query()->whereHas('courseEvents.venue.city.country', fn($query) => $query->where('countries.code', request()->route('country')))->count() }}">
+                <div class="flex items-center space-x-2">
+                    <span>{{ __('Kurse') }}</span>
+                    <img alt="{{ request()->route('country') }}"
+                         src="{{ asset('vendor/blade-flags/country-'.request()->route('country').'.svg') }}"
+                         width="24" height="12"/>
+                </div>
             </flux:navlist.item>
             <flux:navlist.item icon="user" :href="route_with_country('lecturers.index')"
                                :current="request()->routeIs('lecturers.index')"
                                wire:navigate
-                               badge="{{ \App\Models\Lecturer::query()->count() }}">
-                {{ __('Dozenten') }}
+                               badge="{{ \App\Models\Lecturer::query()->whereHas('coursesEvents.venue.city.country', fn($query) => $query->where('countries.code', request()->route('country')))->count() }}">
+                <div class="flex items-center space-x-2">
+                    <span>{{ __('Dozenten') }}</span>
+                    <img alt="{{ request()->route('country') }}"
+                         src="{{ asset('vendor/blade-flags/country-'.request()->route('country').'.svg') }}"
+                         width="24" height="12"/>
+                </div>
             </flux:navlist.item>
         </flux:navlist.group>
 
diff --git a/resources/views/livewire/courses/index.blade.php b/resources/views/livewire/courses/index.blade.php
index 5df937f..8818023 100644
--- a/resources/views/livewire/courses/index.blade.php
+++ b/resources/views/livewire/courses/index.blade.php
@@ -32,6 +32,7 @@ class extends Component {
                     ->where('name', 'ilike', '%'.$this->search.'%')
                     ->orWhere('description', 'ilike', '%'.$this->search.'%'),
                 )
+                ->whereHas('courseEvents.venue.city.country', fn($query) => $query->where('countries.code', request()->route('country')))
                 ->orderByDesc('has_future_events')
                 ->paginate(15),
         ];
diff --git a/resources/views/livewire/courses/landingpage.blade.php b/resources/views/livewire/courses/landingpage.blade.php
index 7b42676..0b1ee77 100644
--- a/resources/views/livewire/courses/landingpage.blade.php
+++ b/resources/views/livewire/courses/landingpage.blade.php
@@ -18,6 +18,9 @@ class extends Component {
     public function mount(): void
     {
         $this->country = request()->route('country', config('app.domain_country'));
+        $this->course->load([
+           'courseEvents.registrations',
+        ]);
     }
 
     public function with(): array
@@ -26,7 +29,10 @@ class extends Component {
             'course' => $this->course->load('lecturer'),
             'events' => $this->course
                 ->courseEvents()
-                ->with(['venue.city'])
+                ->with([
+                    'venue.city',
+                    'registrations',
+                ])
                 ->where('from', '>=', now())
                 ->orderBy('from', 'asc')
                 ->get(),
diff --git a/resources/views/livewire/lecturers/index.blade.php b/resources/views/livewire/lecturers/index.blade.php
index f783ec8..61c240c 100644
--- a/resources/views/livewire/lecturers/index.blade.php
+++ b/resources/views/livewire/lecturers/index.blade.php
@@ -35,6 +35,9 @@ class extends Component {
                 ->withCount([
                     'coursesEvents as future_events_count' => fn($query) => $query->where('from', '>=', now()),
                 ])
+                ->whereHas('coursesEvents')
+                ->whereHas('coursesEvents.venue.city.country',
+                    fn($query) => $query->where('countries.code', $this->country))
                 ->when($this->search, fn($query)
                     => $query
                     ->where('name', 'ilike', '%'.$this->search.'%')