diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index 8947b2565..627cbd424 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -882,7 +882,7 @@ protected Line parseLine(final @Nullable String id, final @Nullable String netwo
                 if (trainName.equals("Nachtbus"))
                     return new Line(id, network, Product.BUS, str);
                 if (trainName.equals("Anrufsammeltaxi"))
-                    return new Line(id, network, Product.BUS, str);
+                    return new Line(id, network, Product.ON_DEMAND, str);
                 if (trainName.equals("Ersatzverkehr"))
                     return new Line(id, network, Product.BUS, str);
                 if (trainName.equals("Vienna Airport Lines"))
@@ -1358,7 +1358,7 @@ protected Line parseLine(final @Nullable String id, final @Nullable String netwo
             return new Line(id, network, Product.SUBWAY, name);
         } else if ("3".equals(mot) || "4".equals(mot)) {
             return new Line(id, network, Product.TRAM, name);
-        } else if ("5".equals(mot) || "6".equals(mot) || "7".equals(mot) || "10".equals(mot)) {
+        } else if ("5".equals(mot) || "6".equals(mot) || "7".equals(mot)) {
             if ("Schienenersatzverkehr".equals(name))
                 return new Line(id, network, Product.BUS, "SEV");
             else
@@ -1367,6 +1367,8 @@ protected Line parseLine(final @Nullable String id, final @Nullable String netwo
             return new Line(id, network, Product.CABLECAR, name);
         } else if ("9".equals(mot)) {
             return new Line(id, network, Product.FERRY, name);
+        } else if ("10".equals(mot)) {
+            return new Line(id, network, Product.ON_DEMAND, name);
         } else if ("11".equals(mot)) {
             return new Line(id, network, null, ParserUtils.firstNotEmpty(symbol, name));
         } else if ("13".equals(mot)) {
diff --git a/src/de/schildbach/pte/VgnProvider.java b/src/de/schildbach/pte/VgnProvider.java
index cd86ebc99..9be6ac1e6 100644
--- a/src/de/schildbach/pte/VgnProvider.java
+++ b/src/de/schildbach/pte/VgnProvider.java
@@ -50,11 +50,11 @@ protected Line parseLine(final @Nullable String id, final @Nullable String netwo
             final @Nullable String trainType, final @Nullable String trainNum, final @Nullable String trainName) {
         if ("0".equals(mot)) {
             if ("R5(z)".equals(trainNum))
-                return new Line(id, network, Product.REGIONAL_TRAIN, "R5(z)");
+                return new Line(id, network, Product.HIGH_SPEED_TRAIN, "R5(z)");
             if ("R7(z)".equals(trainNum))
-                return new Line(id, network, Product.REGIONAL_TRAIN, "R7(z)");
+                return new Line(id, network, Product.HIGH_SPEED_TRAIN, "R7(z)");
             if ("R8(z)".equals(trainNum))
-                return new Line(id, network, Product.REGIONAL_TRAIN, "R8(z)");
+                return new Line(id, network, Product.HIGH_SPEED_TRAIN, "R8(z)");
         }
 
         return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);