diff --git a/Hyperrail/build.gradle b/Hyperrail/build.gradle
index 5a2546dc..beb84cf5 100644
--- a/Hyperrail/build.gradle
+++ b/Hyperrail/build.gradle
@@ -8,8 +8,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.firebase-perf'
 apply plugin: 'com.google.firebase.firebase-crash'
 
-def VERSION_CODE = 5
-def VERSION_NAME = '0.9.3'
+def VERSION_CODE = 6
+def VERSION_NAME = '0.9.4'
 
 android {
     signingConfigs {
diff --git a/Hyperrail/src/main/java/be/hyperrail/android/persistence/PersistentQueryProvider.java b/Hyperrail/src/main/java/be/hyperrail/android/persistence/PersistentQueryProvider.java
index f247adfc..83badb18 100644
--- a/Hyperrail/src/main/java/be/hyperrail/android/persistence/PersistentQueryProvider.java
+++ b/Hyperrail/src/main/java/be/hyperrail/android/persistence/PersistentQueryProvider.java
@@ -603,19 +603,20 @@ private ArrayList<RouteQuery> setToList(Set<String> set, RouteQuery.RouteQueryTy
                 Station from = stationProvider.getStationById(object.getString("from"));
                 Station to = null;
 
+                if (from == null) {
+                    FirebaseCrash.logcat(Level.SEVERE.intValue(), "PersistentQuery", "Loaded invalid routeQuery: " + object.getString("from") + " could not be decoded! Type is " + type.toString());
+                }
+
                 if (!object.getString("to").equals("")) {
                     to = stationProvider.getStationById(object.getString("to"));
                 }
+                if (from != null) {
+                    RouteQuery query = new RouteQuery(from, to);
+                    query.created_at = new Date(object.getLong("created_at"));
+                    query.type = type;
 
-                RouteQuery query = new RouteQuery(from, to);
-                query.created_at = new Date(object.getLong("created_at"));
-                query.type = type;
-
-                if (from == null) {
-                    FirebaseCrash.logcat(Level.SEVERE.intValue(), "PersistentQuery", "Loaded invalid routeQuery: " + object.getString("from") + " could not be decoded! Type is " + type.toString());
+                    results.add(query);
                 }
-
-                results.add(query);
             } catch (JSONException exception) {
                 FirebaseCrash.logcat(Level.WARNING.intValue(), "PersistentQuery", "Failed to load routequery for type " + type.toString() + ": " + exception.getMessage());
                 // ignored
diff --git a/Hyperrail/src/main/res/layout/fragment_liveboard_search.xml b/Hyperrail/src/main/res/layout/fragment_liveboard_search.xml
index b371013d..0bd8ba3e 100644
--- a/Hyperrail/src/main/res/layout/fragment_liveboard_search.xml
+++ b/Hyperrail/src/main/res/layout/fragment_liveboard_search.xml
@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -13,13 +13,12 @@
             android:id="@+id/input_station"
             android:layout_width="match_parent"
             android:layout_height="@dimen/cardlist_textrow_double_height"
-            android:maxLines="1"
-
-            android:textColor="@color/colorTextLight"
             android:hint="@string/search_station_name"
+            android:inputType="textFilter"
+            android:maxLines="1"
             android:paddingTop="@dimen/activity_vertical_margin"
+            android:textColor="@color/colorTextLight"
             android:theme="@style/HyperrailAccentSearchText"
-            android:inputType="textFilter"
             />
 
     </LinearLayout>
@@ -29,5 +28,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
-        android:paddingBottom="@dimen/cardlist_vertical_spacing" />
+        android:paddingBottom="@dimen/cardlist_vertical_spacing"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Hyperrail/src/main/res/layout/fragment_route_search.xml b/Hyperrail/src/main/res/layout/fragment_route_search.xml
index 7b33f2aa..73826aa1 100644
--- a/Hyperrail/src/main/res/layout/fragment_route_search.xml
+++ b/Hyperrail/src/main/res/layout/fragment_route_search.xml
@@ -30,6 +30,7 @@
                 android:layout_weight="1"
                 android:completionThreshold="1"
                 android:hint="@string/from"
+                android:inputType="text|textAutoComplete"
                 android:maxLines="1"
                 android:textColor="@color/colorTextLight"
                 android:theme="@style/HyperrailAccentSearchAutocomplete"
@@ -55,6 +56,7 @@
                 android:layout_weight="1"
                 android:completionThreshold="1"
                 android:hint="@string/to"
+                android:inputType="text|textAutoComplete"
                 android:maxLines="1"
                 android:textColor="@color/colorTextLight"
                 android:theme="@style/HyperrailAccentSearchAutocomplete"/>
@@ -70,8 +72,8 @@
             android:id="@+id/container_arrivedepart"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="left"
             android:animateLayoutChanges="false"
+            android:gravity="left"
             android:orientation="horizontal">
 
             <Spinner