diff --git a/ZTravel.Web/Pages/Shared/_LayoutFern.cshtml b/ZTravel.Web/Pages/Shared/_LayoutFern.cshtml
index 09487f6..1513020 100644
--- a/ZTravel.Web/Pages/Shared/_LayoutFern.cshtml
+++ b/ZTravel.Web/Pages/Shared/_LayoutFern.cshtml
@@ -35,7 +35,13 @@
 </div>
 <div class="app applight">
     <ul>
-        @foreach (var dep in DbfApi.GetDepartures("dbf.finalrewind.org", station, via).Where(dep => !fernverkehrOnly || dep.TrainClasses.Contains("F") || dep.Destination == andShowDestination).Where(dep => !onlyDepartures || !string.IsNullOrWhiteSpace(dep.ScheduledDeparture))) {
+        @foreach (var dep in DbfApi.GetDepartures("dbf.finalrewind.org", station, via)) {
+            if (fernverkehrOnly && !dep.TrainClasses.Contains("F") && dep.Destination != andShowDestination) {
+                continue;
+            }
+            if (onlyDepartures && string.IsNullOrWhiteSpace(dep.ScheduledDeparture)) {
+                continue;
+            }
             if (dep.Route.Select(r => r.Name).Contains(excludingVia)) {
                 continue;
             }