diff --git a/module-server/src/main/kotlin/de/hbt/routing/service/RoutingParametersService.kt b/module-server/src/main/kotlin/de/hbt/routing/service/RoutingParametersService.kt
index d88507b..047f0e6 100644
--- a/module-server/src/main/kotlin/de/hbt/routing/service/RoutingParametersService.kt
+++ b/module-server/src/main/kotlin/de/hbt/routing/service/RoutingParametersService.kt
@@ -38,7 +38,10 @@ Destination: Where the user wants to go.
 Time: When the user wants to travel.
 If start or destination are missing, set it to null. Handle informal language and adjust time to UTC.
 Use the next AM/PM if applicable, and for "now" use $now.
-If only a day is given, assume the current time on that day. If no time can be inferred, set it to now.
+If only a day is given, assume the current time on that day. If no time can be inferred, set it to $now.
+
+"Bist du Aldi? Wo geht?" denotes the wish to go to Aldi where a friend already is.
+"Ich Edeka" means that I am at Edeka.
 
 Return a plain unformatted json (no markdown).
 Example output: {"start": "New York", "destination": "Boston", "time": "$now"}
diff --git a/module-server/src/test/kotlin/de/hbt/routing/service/RoutingParametersServiceIntegrationTest.kt b/module-server/src/test/kotlin/de/hbt/routing/service/RoutingParametersServiceIntegrationTest.kt
index 26788af..945a4e4 100644
--- a/module-server/src/test/kotlin/de/hbt/routing/service/RoutingParametersServiceIntegrationTest.kt
+++ b/module-server/src/test/kotlin/de/hbt/routing/service/RoutingParametersServiceIntegrationTest.kt
@@ -70,18 +70,20 @@ class RoutingParametersServiceIntegrationTest {
                         result("Grüningweg", "Holmer Straße, Wedel", TOMORROW_AT_8)),
                 of("Vom Hauptbahnhof zur Stadthausbrücke",
                         result("Hauptbahnhof", "Stadthausbrücke", NOW)),
-                of("Ich am in Ahrensburg. When can I get the next connection to Lüneburg?",
+                of("I am in Ahrensburg. When can I get the next connection to Lüneburg?",
                         result("Ahrensburg", "Lüneburg", NOW)),
                 of("Wie komme ich jetzt von der Mühlenstraße zum Rathausplatz in Hamburg?",
                         result("Mühlenstraße", "Rathausplatz, Hamburg", NOW)),
                 of("Ab Schanzenviertel nach St. Pauli",
                         result("Schanzenviertel", "St. Pauli", NOW)),
-                of("Ich möchte gerne vom Jungfernstieg zum Altonaer Fischmarkt.",
+                of("Ich möchte gerne zum Altonaer Fischmarkt vom Jungfernstieg.",
                         result("Jungfernstieg", "Altonaer Fischmarkt", NOW)),
                 of("Vom Hauptbahnhof zur Stadthausbrücke morgen",
                         result("Hauptbahnhof", "Stadthausbrücke", TOMORROW_AT_THE_SAME_TIME)),
                 of("Vom Schulterblatt zur Grindelallee übermorgen um 12 Uhr",
-                        result("Schulterblatt", "Grindelallee", IN_TWO_DAYS_AT_12))
+                        result("Schulterblatt", "Grindelallee", IN_TWO_DAYS_AT_12)),
+                of("Eh, Digga, bist du Aldi? Wo geht? Ich Edeka.",
+                        result("Edeka", "Aldi", NOW)),
         )
 
         private fun result(