diff --git a/src/dijkstrasearch.c b/src/dijkstrasearch.c
index b08cadd..4910369 100644
--- a/src/dijkstrasearch.c
+++ b/src/dijkstrasearch.c
@@ -280,8 +280,8 @@ int dijkstra_search_route_to_geojson(struct dijkstra_search *search,
 					format_str = "Waypoint for %2$s (going %1$s)"; // TODO: check whether we are passing a station
 				else
 					format_str = "Stay on %2$s by going %1$s";
-			} else if (node->layer->type == TRAINLINE || node->layer->type == ACCESS) {
-				format_str = "[T] Take the %2$s";
+			} else if ((node->layer->type == TRAINLINE || node->layer->type == ACCESS) && node_last->layer->type == ACCESS) {
+				format_str = "[T] Take the %2$s"; // TODO: Somewhere here we probably also have the interchange
 			} else {
 				if (node_last->layer->type == TRAINLINE)
 					format_str = "[T] Leave the train at %2$s";
diff --git a/src/main.c b/src/main.c
index 68f6d9f..6363cdd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
 		file_name = strchr(argv[i], ':');
 		if (!file_name) {
 			file_name = argv[i];
-			file_type = "street";
+			file_type = "streets";
 		} else {
 			*file_name = '\0';
 			file_name++;