diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml
index 06a0712..eaa7d06 100644
--- a/res/layout/activity_about.xml
+++ b/res/layout/activity_about.xml
@@ -1,46 +1,46 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               tools:context="it.reyboz.bustorino.ActivityAbout" android:orientation="vertical">
     <!-- The ActionBar displayed at the top -->
 
     <include
             layout="@layout/default_toobar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
     <TextView
             android:id="@+id/aboutTextView"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginTop="5dip"
             android:layout_marginLeft="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_weight="0.85"
     />
     <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginTop="2dp"
             android:id="@+id/theDivider"
             android:background="@android:color/darker_gray"/>
     <TextView
             android:text="@string/app_version"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" android:id="@+id/versionTextView"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:gravity="center_vertical"
+            android:gravity="center_horizontal|center_vertical"
             android:layout_margin="10dp"
             android:layout_marginLeft="20dp"
             android:layout_marginStart="20dp"
 
-    />
+            android:textColor="@color/black"/>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_arrivals.xml b/res/layout/fragment_arrivals.xml
index 4708ce5..e003e4c 100644
--- a/res/layout/fragment_arrivals.xml
+++ b/res/layout/fragment_arrivals.xml
@@ -1,98 +1,98 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:fab="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
         <androidx.cardview.widget.CardView
             android:id="@+id/messageCardView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginBottom="10dp"
             fab:cardCornerRadius="5dp"
             fab:cardElevation="2dp">
 
                 <TextView
                     android:id="@+id/messageTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
                     android:layout_marginLeft="8dp"
                     android:layout_toStartOf="@+id/addToFavorites"
                     android:layout_toLeftOf="@+id/addToFavorites"
 
                     android:foreground="?attr/selectableItemBackground"
                     android:gravity="center_vertical"
                     android:minHeight="40dp"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
                 <ImageButton
                     android:id="@+id/addToFavorites"
                     android:layout_width="45dp"
                     android:layout_height="match_parent"
                     android:layout_gravity="end"
                     android:background="@android:color/transparent"
                     android:foreground="?attr/selectableItemBackground"
                     fab:srcCompat="@drawable/ic_star_outline"
                     tools:ignore="OnClick" />
 
         </androidx.cardview.widget.CardView>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_below="@+id/messageCardView"
             android:orientation="vertical"
 
             android:layout_height="wrap_content">
 
                 <ListView
                     android:id="@+id/resultsListView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="9"
                     android:clickable="true"
                     android:descendantFocusability="blocksDescendants"
                     android:focusable="true"
                     android:scrollbars="vertical"
                     android:visibility="visible">
 
                 </ListView>
 
                 <View
                     android:id="@+id/divider_arr"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
                     android:background="@color/grey_100"
                     />
 
                 <LinearLayout
                     android:id="@+id/theLinearLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
 
                     android:layout_marginTop="5dp"
 
                     android:layout_marginBottom="5dp"
                     android:orientation="horizontal">
 
                         <TextView
                             android:id="@+id/timesSourceTextView"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="15dp"
                             android:layout_marginLeft="15dp"
-                            android:text="Source of arrivals"
+                            android:text=""
                             android:textAppearance="?android:attr/textAppearanceMedium"
                             android:textSize="19sp"
 
                             />
                 </LinearLayout>
         </LinearLayout>
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/stop_card.xml b/res/layout/stop_card.xml
index 16c5e10..b707222 100644
--- a/res/layout/stop_card.xml
+++ b/res/layout/stop_card.xml
@@ -1,116 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
 		xmlns:card_view="http://schemas.android.com/apk/res-auto"
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/stop_cardView"
 		android:foreground="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		card_view:cardCornerRadius="1dp"
 		android:layout_margin="8dp" android:padding="4dp">
 
 	<LinearLayout
 			android:orientation="horizontal"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent" android:gravity="center_vertical">
 		<RelativeLayout
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content" android:layout_weight="1">
 
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:text="Title"
 					android:id="@+id/stop_nameText"
 					style="@style/TextAppearance.AppCompat.Medium"
 					android:layout_alignParentLeft="true"
 					android:layout_alignParentStart="true" android:paddingLeft="6dp"
 					android:textColor="@color/primary_material_dark" android:layout_marginBottom="6dp"
 					android:layout_marginTop="6dp" android:layout_marginLeft="6dp"
 					android:layout_marginStart="6dp" android:layout_marginRight="6dp" android:layout_marginEnd="6dp"/>
 			<TextView
 					android:id="@+id/stop_numberText"
 					android:layout_width="wrap_content"
 					android:layout_height="20dp"
 					android:text="stopNumber"
 					android:gravity="center_vertical"
 					android:textAppearance="@style/TextAppearance.AppCompat.Medium"
 					android:layout_below="@id/stop_nameText"
-					android:textIsSelectable="true" android:layout_marginTop="6dp"
-					android:layout_margin="8dp"
-					android:textColor="@color/orange_500" android:layout_marginLeft="10dp"/>
+					android:textIsSelectable="true" android:layout_marginTop="8dp"
+					android:textColor="@color/orange_500" android:layout_marginLeft="12dp"
+					android:layout_marginStart="12dp" android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
+					android:layout_marginBottom="8dp"/>
 			<TextView
 					android:text="TextView"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginRight="6dp"
 					android:layout_marginLeft="10dp"
 					android:minWidth="50dp"
 					android:id="@+id/stop_distanceTextView" android:layout_toEndOf="@+id/stop_numberText"
 					android:layout_toRightOf="@id/stop_numberText"
 					android:layout_alignTop="@+id/stop_numberText"
 			/>
 
 			<!--
         <LinearLayout
                 android:orientation="horizontal"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent" android:id="@+id/row1" android:layout_below="@+id/stopTitle">
             <TextView
                     android:id="@+id/txtLine1_1"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
                     android:textSize="14sp"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
             <TextView
                     android:id="@+id/txtPass1_1"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
 
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
             <TextView
                     android:id="@+id/txtPass2"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
                     android:textSize="14sp"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
             <TextView
                     android:id="@+id/txtPass3"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
                     android:textSize="14sp"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
         </LinearLayout>
         -->
 		</RelativeLayout>
 		<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text=""
 				android:id="@+id/stop_linesText"
 				android:layout_toRightOf="@+id/stop_distanceTextView"
 				android:minWidth="80dp"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true" android:layout_alignBottom="@+id/stop_distanceTextView"
 				android:layout_alignTop="@+id/stop_nameText"
 				android:nestedScrollingEnabled="true"
 				android:gravity="center_horizontal|center"
 				android:textColor="@color/blue_700" android:textSize="14sp" android:layout_weight="1"
 				android:padding="5dp" android:maxWidth="100sp" android:layout_gravity="center_vertical|end"
 				android:layout_marginRight="5dp"/>
 	</LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f6b290e..3eedbb2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,153 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
 
     <string name="app_description">Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy.</string>
     <string name="search">Cerca</string>
     <string name="qrcode">QR Code</string>
     <string name="insert_bus_stop_number">Numero fermata</string>
     <string name="insert_bus_stop_name">Nome fermata</string>
     <string name="insert_bus_stop_number_error">Inserisci il numero della fermata</string>
     <string name="insert_bus_stop_name_error">Inserisci il nome della fermata</string>
     <string name="network_error">Verifica l\'accesso ad Internet!</string>
     <string name="no_bus_stop_have_this_name">Sembra che nessuna fermata abbia questo nome</string>
     <string name="parsing_error">Errore di lettura del sito 5T/GTT (dannato sito!)</string>
     <string name="passages">Fermata: %1$s</string>
     <string name="lines">Linee: %1$s</string>
     <string name="results">Scegli la fermata…</string>
     <string name="no_passages">Nessun passaggio</string>
     <string name="no_qrcode">Nessun QR code</string>
     <string name="action_favorites">Preferiti</string>
     <string name="action_help">Aiuto</string>
     <string name="action_about">Informazioni</string>
     <string name="action_about_more">Più informazioni</string>
     <string name="action_wiki">Contribuisci</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/it/</string>
     <string name="action_source">Codice sorgente</string>
     <string name="action_licence">Licenza</string>
     <string name="action_author">Incontra l\'autore</string>
     <string name="added_in_favorites">Fermata aggiunta ai preferiti</string>
     <string name="cant_add_to_favorites">Impossibile aggiungere ai preferiti (memoria piena o database corrotto?)!</string>
     <string name="title_activity_favorites">Preferiti</string>
     <string name="title_activity_map">Mappa</string>
     <string name="tip_add_favorite">Nessun preferito? Arghh!\nSchiaccia sulla stella di una fermata per aggiungerla a questa lista!</string>
     <string name="action_remove_from_favourites">Rimuovi</string>
     <string name="action_rename_bus_stop_username">Rinomina</string>
     <string name="dialog_rename_bus_stop_username_title">Rinomina fermata</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about">Informazioni</string>
     <string name="howDoesItWork"><b>Tocca la stella</b> per aggiungere la fermata ai preferiti\n\n<b>Come leggere gli orari:</b>
         \n<b>&#160;&#160;&#160;12:56*</b> Orario in tempo reale\n<b>&#160;&#160;&#160;12:56</b> &#160; Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario.
         \n<b>Tocca a lungo</b> su <b>Fonte Orari</b> per cambiare sorgente degli orari di arrivo.
     </string>
     <string name="hint_button">OK!</string>
     <string name="about_history">
 <![CDATA[
         <h1>Benvenuto!</h1>
         
         <p>Grazie per aver scelto BusTO, un\'app <b>indipendente</b> da GTT/5T, per spostarsi a Torino attraverso <b>software libero</b>:</p>
 		
 		<p>Perché usare BusTO?</p>
 		<p>
         - Non sei <b>monitorato</b><br>
         - Non ci sono <b>pubblicità</b><br>
         - La tua <b>privacy</b> è al sicuro<br>
         - Inoltre l\'app è molto leggera!<br>
         </p>
 
         <h2>Come Funziona?</h2>
         <p>Quest\'app ottiene i passaggi dei bus in tempo reale filtrando i dati forniti pubblicamente sul sito <b>www.gtt.to.it</b> o <i>www.5t.torino.it</i> "per uso personale".</p>
 
 		<p>Ingredienti:<br>
 		- <b>Fabio Mazza</b> attuale rockstar developer anziano.<br>
 		- <b>Andrea Ugo</b> attuale rockstar developer in formazione.<br>
 		- <b>Silviu Chiriac</b> designer del logo 2021.<br>
+		- <b>Marco M</b> formidabile tester e cacciatore di bug.<br>
 		- <b>Ludovico Pavesi</b> ex rockstar developer anziano asd.<br>
 		- <b>Valerio Bozzolan</b> attuale manutentore.<br>
 		- <b>Marco Gagino</b> apprezzato ex collaboratore, ideatore icona e grafica.<br>
 		- <b>JSoup</b> libreria per "<i>web scaping</i>".<br>
 		- <b>Google</b> icone e libreria di supporto per il Material Design.<br>
 		- Tutti i contributori!
 		</p>
 
 		<h2>Licenze</h2>
 		<p>L\'app e il relativo codice sorgente sono distribuiti sotto la licenza <i>GNU General Public License v3+</i>.
 		Ciò <b>significa</b> che puoi usare, studiare, migliorare e ricondividere quest\'app con <b>qualunque mezzo</b> e per <b>qualsiasi scopo</b>: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan.
 		</p>
 		
 		<h2>Note</h2>
 		<p>Quest\'applicazione è rilasciata <b>nella speranza che sia utile a tutti</b> ma senza NESSUNA garanzia.</p>
 		<p>Buon utilizzo! :)</p>
     ]]>
     </string>
     <string name="query_too_short">Nome troppo corto, digita più caratteri e riprova</string>
     <string name="route_towards_destination">%1$s verso %2$s</string>
     <string name="route_towards_unknown">%s (destinazione sconosciuta)</string>
     <string name="internal_error">Errore interno inaspettato, impossibile estrarre dati dal sito GTT/5T</string>
     <string name="action_view_on_map">Visualizza sulla mappa</string>
     <string name="cannot_show_on_map_no_activity">Non trovo un\'applicazione dove mostrarla</string>
     <string name="cannot_show_on_map_no_position">Posizione della fermata non trovata</string>
 
 
     <string name="nearby_stops_message">Fermate vicine</string>
     <string name="position_searching_message">Ricerca della posizione in corso&#8230;</string>
     <string name="no_stops_nearby">Nessuna fermata nei dintorni</string>
     <string name="main_menu_pref">Preferenze</string>
     <string name="database_update_message">Aggiornamento del database&#8230;</string>
-    <string name="pref_num_elements">Numero di fermate</string>
+    <string name="pref_num_elements">Numero minimo di fermate</string>
+    <string name="num_stops_nearby_not_number">Il numero di fermate da ricercare non è valido</string>
+    <string name="invalid_number">Valore errato, inserisci un numero</string>
     <string name="title_activity_settings">Impostazioni</string>
+    <string name="settings_search_radius">Distanza massima di ricerca (m)</string>
+    <string name="settings_experimental">Funzionalità sperimentali</string>
     <string name="action_settings">Impostazioni</string>
+    <string name="general_settings">Generali</string>
     <string name="pref_recents_group_title">Fermate recenti</string>
     <string name="settings_group_general">Impostazioni generali</string>
     <string name="settings_group_database">Gestione del database</string>
     <string name="settings_reset_database">Comincia aggiornamento manuale del database</string>
 
+
     <string name="enable_position_message_map">Consenti l\'accesso alla posizione per mostrarla sulla mappa</string>
     <string name="enableGpsText">Abilitare il GPS</string>
-    <string name="settings_search_radius">Raggio di ricerca</string>
-    <string name="settings_experimental">Funzionalità sperimentali</string>
     <string name="bus_arriving_at">arriva alle</string>
     <string name="arrivals_card_at_the_stop">alla fermata</string>
     <string name="show_arrivals">Mostra arrivi</string>
     <string name="show_stops">Mostra fermate</string>
     <string name="nearby_arrivals_message">Arrivi qui vicino</string>
     <string name="removed_from_favorites">Fermata rimossa dai preferiti</string>
 
     <!--
     Map view buttons strings
     !-->
     <string name="bt_center_map_description">La mia posizione</string>
     <string name="bt_follow_me_description">Segui posizione</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Fonte orari: %1$s</string>
     <string name="fivetapifetcher">App GTT</string>
     <string name="gttjsonfetcher">Sito GTT</string>
     <string name="fivetscraper">Sito 5T Torino</string>
     <string name="arrival_source_changing">Cambiamento sorgente orari…</string>
     <string name="change_arrivals_source_message">Premi a lungo per cambiare la sorgente degli orari</string>
 
 
     <string name="default_notification_channel_description">Canale unico delle notifiche</string>
     <string name="too_many_permission_asks">Chiesto troppe volte per il permesso %1$s</string>
     <string name="permission_storage_maps_msg">Non si può usare questa funzionalità senza il permesso di archivio</string>
     <string name="storage_permission">di archivio</string>
     <string name="message_crash">Un bug ha fatto crashare l\'app!
         \nPremi \"OK\" per inviare il report agli sviluppatori via email, così potranno scovare e risolvere il tuo bug!
         \nIl report contiene piccole informazioni non sensibili sulla configurazione del tuo telefono e sullo stato dell\'app al momento del crash.
     </string>
     <string name="acra_email_message">L\'applicazione è crashata, e il crash report è stato messo negli allegati. Se vuoi, descrivi cosa stavi facendo prima che si interrompesse: \n</string>
     <string name="nav_arrivals_text">Arrivi</string>
     <string name="nav_map_text">Mappa</string>
     <string name="nav_favorites_text">Preferiti</string>
     <string name="drawer_open">Apri drawer</string>
     <string name="drawer_close">Chiudi drawer</string>
     <string name="experiments">Esperimenti</string>
     <string name="donate_now">Offrici un caffè</string>
     <string name="map">Mappa</string>
     <string name="stop_search_view_title">Ricerca fermate</string>
     <string name="app_version">Versione app</string>
 
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2a1ba0e..800aec7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <color name="orange_500">#ff9800</color>
     <color name="orange_700">#F57C00</color>
     <color name="blue_500">#2196F3</color>
     <color name="blue_700">#2060dd</color> <!-- #1976D2 -->
     <color name="teal_500">#009688</color>
     <color name="teal_300">#4DB6AC</color>
     <color name="teal_200">#80cbc4</color>
     <color name="grey_100">#F5F5F5</color>
     <color name="grey_600">#757575</color>
     <!--<color name="white">#FFFFFF</color>
     <color name="accent">#009688</color>-->
     <color name="metro_red">#DE0908</color>
     <color name="blue_extraurbano">#2060DD</color>
     <color name="white">#FFFFFF</color>
+    <color name="black">#000000</color>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9afb67a..55996c9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,169 +1,174 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name" translatable="false">BusTO</string>
     <string name="app_name_full" translatable="false">Libre BusTO</string>
     <string name="app_name_debug" translatable="false">BusTO dev</string>
     <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
     </string>
     <string name="search">Search</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="insert_bus_stop_number">Bus stop number</string>
     <string name="insert_bus_stop_name">Bus stop name</string>
     <string name="insert_bus_stop_number_error">Insert bus stop number</string>
     <string name="insert_bus_stop_name_error">Insert bus stop name</string>
     <string name="route_towards_destination">%1$s towards %2$s</string>
     <string name="route_towards_unknown">%s (unknown destination)</string>
     <string name="network_error">Verify your Internet connection!</string>
     <string name="no_bus_stop_have_this_name">Seems that no bus stop have this name</string>
     <string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
     <string name="query_too_short">Name too short, type more characters and retry
     </string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
     <string name="passages">Arrivals at: %1$s</string>
     <string name="results">Choose the bus stop…</string>
     <string name="lines">Lines: %1$s</string>
     <string name="no_passages">No timetable found</string>
     <string name="no_qrcode">No QR code</string>
     <string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
     <string name="action_help">Help</string>
     <string name="action_about">About</string>
     <string name="action_about_more">More about</string>
     <string name="action_wiki">Contribute</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
     <string name="action_source">Source code</string>
     <string name="action_licence">Licence</string>11
     <string name="action_author">Meet the author</string>
     <string name="added_in_favorites">Bus stop is now in your favorites</string>
     <string name="removed_from_favorites">Bus stop removed from your favorites</string>
     <string name="action_favorites">Favorites</string>
     <string name="title_activity_favorites">Favorites</string>
     <string name="title_activity_map">Map</string>
     <string name="tip_add_favorite">No favorites? Arghh! Press on a bus stop star to populate this list!</string>
     <string name="action_remove_from_favourites">Delete</string>
     <string name="action_rename_bus_stop_username">Rename</string>
     <string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about">About</string>
     <string name="howDoesItWork">
         <b>Tap the star</b>
         to add the bus stop to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
         arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
         \n <b>Long press on Arrivals source</b> to change the source of the arrival times
     </string>
     <string name="hint_button">GOT IT!</string>
     <string name="about_history">
         <![CDATA[
         <h1>Welcome!</h1>
 
         <p>Thanks for using BusTO, a "politically" <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
 
         <p>Why use this app?</p>
 		<p>
         - You\'ll never be <b>tracked</b><br>
         - You\'ll never see boring <b>ads</b><br>
         - We\'ll always respect your <b>privacy</b><br>
         - Moreover, it\'s lightweight!<br>
         </p>
 
         <h2>How does it work?</h2>
         <p>This app will show you bus timetables gathering data from <b>www.gtt.to.it</b> or <b>www.5t.torino.it</b> "for personal use".</p>
 
 		<p>Who worked on BusTO:<br>
 		- <b>Fabio Mazza</b> current senior rockstar developer.<br>
         - <b>Andrea Ugo</b> current junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b> designer of the 2021 logo.<br>
+		- <b>Marco M</b> rockstar tester and bug hunter.<br>
 		- <b>Ludovico Pavesi</b> previous senior rockstar developer asd.<br>
 		- <b>Valerio Bozzolan</b> maintainer and infrastructure sponsor.<br>
 		- <b>Marco Gagino</b> contributor and icon creator.<br>
 		- <b>JSoup</b> web scraper library.<br>
 		- <b>makovkastar</b> floating buttons.<br>
 		- <b>Google</b> Material Design icons.<br>
 		- All the contributors!
 		</p>
 		
 		<h2>Licenses</h2>
 		<p>The app and the related source code are released by Valerio Bozzolan under the terms of the <i>GNU General Public License v3+</i>).
 		So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
 
 		<h2>Notes</h2>
 		<p>This app has been developed <b>hoping to be useful to everyone</b> but without ANY warranty.</p>
 		<p>This translation is kindly provided by Riccardo Caniato and Marco Gagino.</p>
 		<p>Get involved! :)</p>
     ]]>
     </string>
+
     <string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
     <string name="action_view_on_map">View on a map</string>
     <string name="cannot_show_on_map_no_activity">Cannot find any application to show it in</string>
     <string name="cannot_show_on_map_no_position">Cannot find the position of the stop</string>
 
     <string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
     <string name="mainSharedPreferences" translatable="false">it.reyboz.bustorino.preferences</string>
     <string name="databaseUpdatingPref" translatable="false">db_is_updating</string>
-
+    <!-- Settings -->
     <string name="nearby_stops_message">Nearby stops</string>
     <string name="nearby_arrivals_message">Nearby connections</string>
     <string name="app_version">App version</string>
+    <string name="num_stops_nearby_not_number">The number of stops to show in the recents is invalid</string>
+    <string name="invalid_number">Invalid value, put a valid number</string>
 
     <string name="position_searching_message">Finding the position&#8230;</string>
     <string name="no_stops_nearby">No stops nearby</string>
-    <string name="pref_num_elements">Number of stops</string>
+    <string name="pref_num_elements">Minimum number of stops</string>
     <string name="main_menu_pref">Preferences</string>
     <string name="title_activity_settings">Settings</string>
     <string name="action_settings">Settings</string>
+    <string name="general_settings">General</string>
     <string name="settings_experimental">Experimental features</string>
-    <string name="settings_search_radius">Search radius</string>
+    <string name="settings_search_radius">Maximum distance (meters)</string>
     <string name="pref_recents_group_title">Recent stops</string>
     <string name="settings_group_general">General settings</string>
     <string name="settings_group_database">Database management</string>
     <string name="settings_reset_database">Launch manual database update</string>
 
     <string name="enable_position_message_map">Allow access to position to show it on the map</string>
     <string name="enableGpsText">Please enable GPS</string>
     <string name="database_update_message">Database update in progress&#8230;</string>
     <string name="bus_arriving_at">is arriving at</string>
     <string name="arrivals_card_at_the_stop">at the stop</string>
     <string name="two_strings_format" translatable="false">%1$s - %2$s</string>
     <string name="show_arrivals">Show arrivals</string>
     <string name="show_stops">Show stops</string>
 
     <!--
    Map view buttons strings
    !-->
     <string name="bt_center_map_description">Center on my location</string>
     <string name="bt_follow_me_description">Follow me</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Arrivals source: %1$s</string>
     <string name="fivetapifetcher">GTT App</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
     <string name="arrival_source_changing">Changing arrival times source…</string>
     <string name="change_arrivals_source_message">Long press to change the source of arrivals</string>
 
     <!--
     Notifications
     -->
     <string name="default_notification_channel" translatable="false">Default</string>
     <string name="default_notification_channel_description">Default channel for notifications</string>
     <string name="too_many_permission_asks">Asked for %1$s permission too many times</string>
     <string name="permission_storage_maps_msg">Cannot use the map with the storage permission!</string>
     <string name="storage_permission">storage</string>
     <string name="message_crash">The application has crashed because you encountered a bug.
         \nIf you want, you can help the developers by sending the crash report via email.
         \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app configuration/state.
     </string>
     <string name="acra_email_message">The application crashed and the crash report is in the attachments. Please
         describe what you were doing before the crash: \n
     </string>
     <string name="nav_arrivals_text">Arrivals</string>
     <string name="nav_map_text">Map</string>
     <string name="nav_favorites_text">Favorites</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
     <string name="experiments">Experiments</string>
     <string name="donate_now">Buy us a coffee</string>
     <string name="map">Map</string>
     <string name="stop_search_view_title">Search by stop</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 22b3740..ffe8fab 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,38 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.preference.PreferenceCategory
-            android:title="General">
+            android:title="@string/general_settings">
         <androidx.preference.SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:title="@string/settings_experimental" android:key="@string/pref_key_experimental"/>
     </androidx.preference.PreferenceCategory>
     <androidx.preference.PreferenceCategory
             android:title="@string/pref_recents_group_title">
+        <!--
     <androidx.preference.EditTextPreference
             android:defaultValue="10"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents" android:inputType="numberDecimal"
-
-            android:digits="0123456789" android:ems="10"
+            android:inputType="number"
+            android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents"
+            app:useSimpleSummaryProvider="true"
+            android:digits="0123456789"
     />
+    -->
+        <androidx.preference.SeekBarPreference
+                android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents"
+                android:defaultValue="4"
+                android:max="40"
+                app:min="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:showSeekBarValue="true"
+
+        />
     <androidx.preference.SeekBarPreference
             android:title="@string/settings_search_radius"
             android:key="@string/pref_key_radius_recents"
             android:defaultValue="500"
             android:max="1000"
-            app:min="20"
+            app:min="100"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
+            app:showSeekBarValue="true"
+
     />
 
     </androidx.preference.PreferenceCategory>
     <!--
     <androidx.preference.Preference
             android:layout="@layout/pref_extra_version"
             android:key="version"
     />
     -->
 </androidx.preference.PreferenceScreen>
diff --git a/src/it/reyboz/bustorino/ActivityPrincipal.java b/src/it/reyboz/bustorino/ActivityPrincipal.java
index c20ece9..3d44aa7 100644
--- a/src/it/reyboz/bustorino/ActivityPrincipal.java
+++ b/src/it/reyboz/bustorino/ActivityPrincipal.java
@@ -1,573 +1,577 @@
 package it.reyboz.bustorino;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.work.BackoffPolicy;
 import androidx.work.Constraints;
 import androidx.work.ExistingPeriodicWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.PeriodicWorkRequest;
 import androidx.work.WorkInfo;
 import androidx.work.WorkManager;
 
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import it.reyboz.bustorino.backend.Stop;
 import it.reyboz.bustorino.data.DBUpdateWorker;
 import it.reyboz.bustorino.data.DatabaseUpdate;
 import it.reyboz.bustorino.fragments.FavoritesFragment;
 import it.reyboz.bustorino.fragments.FragmentKind;
 import it.reyboz.bustorino.fragments.FragmentListenerMain;
 import it.reyboz.bustorino.fragments.MainScreenFragment;
 import it.reyboz.bustorino.fragments.MapFragment;
 import it.reyboz.bustorino.middleware.GeneralActivity;
 
 import static it.reyboz.bustorino.backend.utils.getBusStopIDFromUri;
 import static it.reyboz.bustorino.backend.utils.openIceweasel;
 
 public class ActivityPrincipal extends GeneralActivity implements FragmentListenerMain {
     private DrawerLayout mDrawer;
     private NavigationView mNavView;
     private ActionBarDrawerToggle drawerToggle;
     private final static String DEBUG_TAG="BusTO Act Principal";
 
     private final static String TAG_FAVORITES="favorites_frag";
     private Snackbar snackbar;
 
     private boolean showingMainFragmentFromOther = false;
 
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_principal);
         final SharedPreferences theShPr = getMainSharedPreferences();
 
 
         Toolbar mToolbar = findViewById(R.id.default_toolbar);
         setSupportActionBar(mToolbar);
         if (getSupportActionBar()!=null)
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         else Log.w(DEBUG_TAG, "NO ACTION BAR");
 
         mToolbar.setOnMenuItemClickListener(new ToolbarItemClickListener(this));
 
 
         mDrawer = findViewById(R.id.drawer_layout);
         drawerToggle = setupDrawerToggle(mToolbar);
 
         // Setup toggle to display hamburger icon with nice animation
         drawerToggle.setDrawerIndicatorEnabled(true);
 
         drawerToggle.syncState();
         mDrawer.addDrawerListener(drawerToggle);
 
         mDrawer.addDrawerListener(new DrawerLayout.DrawerListener() {
             @Override
             public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
 
             }
 
             @Override
             public void onDrawerOpened(@NonNull View drawerView) {
                 hideKeyboard();
             }
 
             @Override
             public void onDrawerClosed(@NonNull View drawerView) {
 
             }
 
             @Override
             public void onDrawerStateChanged(int newState) {
             }
         });
 
 
         mNavView = findViewById(R.id.nvView);
 
         setupDrawerContent(mNavView);
         /*View header = mNavView.getHeaderView(0);
 
         */
         //mNavView.getMenu().findItem(R.id.versionFooter).
 
         /// LEGACY CODE
         //---------------------------- START INTENT CHECK QUEUE ------------------------------------
 
         // Intercept calls from URL intent
         boolean tryedFromIntent = false;
 
         String busStopID = null;
         Uri data = getIntent().getData();
         if (data != null) {
             busStopID = getBusStopIDFromUri(data);
             tryedFromIntent = true;
         }
 
         // Intercept calls from other activities
         if (!tryedFromIntent) {
             Bundle b = getIntent().getExtras();
             if (b != null) {
                 busStopID = b.getString("bus-stop-ID");
 
                 /**
                  * I'm not very sure if you are coming from an Intent.
                  * Some launchers work in strange ways.
                  */
                 tryedFromIntent = busStopID != null;
             }
         }
 
         //---------------------------- END INTENT CHECK QUEUE --------------------------------------
 
         if (busStopID == null) {
             // Show keyboard if can't start from intent
             // JUST DON'T
             // showKeyboard();
 
             // You haven't obtained anything... from an intent?
             if (tryedFromIntent) {
 
                 // This shows a luser warning
                 Toast.makeText(getApplicationContext(),
                         R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show();
             }
         } else {
             // If you are here an intent has worked successfully
             //setBusStopSearchByIDEditText(busStopID);
 
             requestArrivalsForStopID(busStopID);
         }
         //Try (hopefully) database update
         PeriodicWorkRequest wr = new PeriodicWorkRequest.Builder(DBUpdateWorker.class, 1, TimeUnit.DAYS)
                 .setBackoffCriteria(BackoffPolicy.LINEAR, 30, TimeUnit.MINUTES)
                 .setConstraints(new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED)
                         .build())
                 .build();
         final WorkManager workManager = WorkManager.getInstance(this);
 
         final int version = theShPr.getInt(DatabaseUpdate.DB_VERSION_KEY, -10);
         if (version >= 0)
             workManager.enqueueUniquePeriodicWork(DBUpdateWorker.DEBUG_TAG,
                     ExistingPeriodicWorkPolicy.KEEP, wr);
         else workManager.enqueueUniquePeriodicWork(DBUpdateWorker.DEBUG_TAG,
                 ExistingPeriodicWorkPolicy.REPLACE, wr);
         /*
         Set database update
          */
         workManager.getWorkInfosForUniqueWorkLiveData(DBUpdateWorker.DEBUG_TAG)
                 .observe(this, workInfoList -> {
                     // If there are no matching work info, do nothing
                     if (workInfoList == null || workInfoList.isEmpty()) {
                         return;
                     }
                     Log.d(DEBUG_TAG, "WorkerInfo: "+workInfoList);
 
                     boolean showProgress = false;
                     for (WorkInfo workInfo : workInfoList) {
                         if (workInfo.getState() == WorkInfo.State.RUNNING) {
                             showProgress = true;
                             break;
                         }
                     }
 
                     if (showProgress) {
                         createDefaultSnackbar();
                     } else {
                         if(snackbar!=null) {
                             snackbar.dismiss();
                             snackbar = null;
                         }
                     }
 
                 });
         // show the main fragment
         showMainFragment();
 
 
     }
     private ActionBarDrawerToggle setupDrawerToggle(Toolbar toolbar) {
         // NOTE: Make sure you pass in a valid toolbar reference.  ActionBarDrawToggle() does not require it
         // and will not render the hamburger icon without it.
         return new ActionBarDrawerToggle(this, mDrawer, toolbar, R.string.drawer_open,  R.string.drawer_close);
 
     }
 
     /**
      * Setup drawer actions
      * @param navigationView the navigation view on which to set the callbacks
      */
     private void setupDrawerContent(NavigationView navigationView) {
         navigationView.setNavigationItemSelectedListener(
                 menuItem -> {
                     if (menuItem.getItemId() == R.id.drawer_action_settings) {
                         Log.d("MAINBusTO", "Pressed button preferences");
                         closeDrawerIfOpen();
                         startActivity(new Intent(ActivityPrincipal.this, ActivitySettings.class));
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_favorites_item){
                         closeDrawerIfOpen();
                         //get Fragment
                         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
                         FavoritesFragment fragment = FavoritesFragment.newInstance();
                         ft.replace(R.id.mainActContentFrame,fragment, TAG_FAVORITES);
                         ft.addToBackStack(null);
                         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
                         ft.commit();
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_arrivals){
                         closeDrawerIfOpen();
                         showMainFragment();
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_map_item){
                         closeDrawerIfOpen();
                         final String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
                         int result = askForPermissionIfNeeded(permission, STORAGE_PERMISSION_REQ);
                         switch (result) {
                             case PERMISSION_OK:
                                 createAndShowMapFragment(null);
                                 break;
                             case PERMISSION_ASKING:
                                 permissionDoneRunnables.put(permission,
                                         () -> createAndShowMapFragment(null));
                                 break;
                             case PERMISSION_NEG_CANNOT_ASK:
                                 String storage_perm = getString(R.string.storage_permission);
                                 String text = getString(R.string.too_many_permission_asks,  storage_perm);
                                 Toast.makeText(getApplicationContext(),text, Toast.LENGTH_LONG).show();
                         }
                         return true;
                     }
                     //selectDrawerItem(menuItem);
-                    Log.d(DEBUG_TAG, "pressed item "+menuItem.toString());
+                    Log.d(DEBUG_TAG, "pressed item "+menuItem);
 
                     return true;
 
                 });
 
     }
 
     private void closeDrawerIfOpen(){
         if (mDrawer.isDrawerOpen(GravityCompat.START))
             mDrawer.closeDrawer(GravityCompat.START);
     }
 
 
     // `onPostCreate` called when activity start-up is complete after `onStart()`
     // NOTE 1: Make sure to override the method with only a single `Bundle` argument
     // Note 2: Make sure you implement the correct `onPostCreate(Bundle savedInstanceState)` method.
     // There are 2 signatures and only `onPostCreate(Bundle state)` shows the hamburger icon.
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // Sync the toggle state after onRestoreInstanceState has occurred.
         drawerToggle.syncState();
     }
 
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         // Pass any configuration change to the drawer toggles
         drawerToggle.onConfigurationChanged(newConfig);
 
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.extra_menu_items, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode==STORAGE_PERMISSION_REQ){
             final String storagePerm = Manifest.permission.WRITE_EXTERNAL_STORAGE;
             if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 Log.d(DEBUG_TAG, "Permissions check: " + Arrays.toString(permissions));
 
                 if (permissionDoneRunnables.containsKey(storagePerm)) {
                     Runnable toRun = permissionDoneRunnables.get(storagePerm);
                     if (toRun != null)
                         toRun.run();
                     permissionDoneRunnables.remove(storagePerm);
                 }
             } else {
                 //permission denied
                 showToastMessage(R.string.permission_storage_maps_msg, false);
             }
         }
     }
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
         int[] cases = {R.id.nav_arrivals, R.id.nav_favorites_item};
         Log.d(DEBUG_TAG, "Item pressed");
 
 
         if (item.getItemId() == android.R.id.home) {
             mDrawer.openDrawer(GravityCompat.START);
             return true;
         }
 
         if (drawerToggle.onOptionsItemSelected(item)) {
 
             return true;
 
         }
         return super.onOptionsItemSelected(item);
 
     }
 
     @Override
     public void onBackPressed() {
         boolean foundFragment = false;
         Fragment shownFrag = getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame);
         if (mDrawer.isDrawerOpen(GravityCompat.START))
             mDrawer.closeDrawer(GravityCompat.START);
         else if(shownFrag != null && shownFrag.isVisible() && shownFrag.getChildFragmentManager().getBackStackEntryCount() > 0){
             //if we have been asked to show a stop from another fragment, we should go back even in the main
+            if(shownFrag instanceof MainScreenFragment){
+                //we have to stop the arrivals reload
+                ((MainScreenFragment) shownFrag).cancelReloadArrivalsIfNeeded();
+            }
             shownFrag.getChildFragmentManager().popBackStackImmediate();
             if(showingMainFragmentFromOther && getSupportFragmentManager().getBackStackEntryCount() > 0){
                 getSupportFragmentManager().popBackStack();
             }
         }
         else if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
             getSupportFragmentManager().popBackStack();
         }
         else
             super.onBackPressed();
     }
 
     private void createDefaultSnackbar() {
         if (snackbar == null) {
             snackbar = Snackbar.make(findViewById(R.id.searchButton), R.string.database_update_message, Snackbar.LENGTH_INDEFINITE);
         }
         snackbar.show();
     }
 
     private MainScreenFragment createAndShowMainFragment(){
         FragmentManager fraMan = getSupportFragmentManager();
 
         MainScreenFragment fragment = MainScreenFragment.newInstance();
 
         FragmentTransaction transaction = fraMan.beginTransaction();
         transaction.replace(R.id.mainActContentFrame, fragment, MainScreenFragment.FRAGMENT_TAG);
         transaction.commit();
         return fragment;
     }
 
     /**
      * Show the fragment by adding it to the backstack
      * @param fraMan the fragmentManager
      * @param fragment the fragment
      */
     private static void showMainFragment(FragmentManager fraMan, MainScreenFragment fragment){
         fraMan.beginTransaction().replace(R.id.mainActContentFrame, fragment)
                 .setReorderingAllowed(true)
                 .addToBackStack(null)
                 /*.setCustomAnimations(
                         R.anim.slide_in,  // enter
                         R.anim.fade_out,  // exit
                         R.anim.fade_in,   // popEnter
                         R.anim.slide_out  // popExit
                 )*/
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .commit();
     }
 
     private MainScreenFragment showMainFragment(){
         FragmentManager fraMan = getSupportFragmentManager();
         Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
-        MainScreenFragment mainScreenFragment = null;
+        final MainScreenFragment mainScreenFragment;
         if (fragment==null | !(fragment instanceof MainScreenFragment)){
             mainScreenFragment = createAndShowMainFragment();
         }
         else if(!fragment.isVisible()){
 
 
             mainScreenFragment = (MainScreenFragment) fragment;
             showMainFragment(fraMan, mainScreenFragment);
             Log.d(DEBUG_TAG, "Found the main fragment");
         } else{
             mainScreenFragment = (MainScreenFragment) fragment;
         }
         return mainScreenFragment;
     }
     @Nullable
     private MainScreenFragment getMainFragmentIfVisible(){
         FragmentManager fraMan = getSupportFragmentManager();
         Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
         if (fragment!= null && fragment.isVisible()) return (MainScreenFragment) fragment;
         else return null;
     }
 
 
     @Override
     public void showFloatingActionButton(boolean yes) {
         //TODO
     }
     /*
     public void setDrawerSelectedItem(String fragmentTag){
         switch (fragmentTag){
             case MainScreenFragment.FRAGMENT_TAG:
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case MapFragment.FRAGMENT_TAG:
 
                 break;
 
             case FavoritesFragment.FRAGMENT_TAG:
                 mNavView.setCheckedItem(R.id.nav_favorites_item);
                 break;
         }
     }*/
 
     @Override
     public void readyGUIfor(FragmentKind fragmentType) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.readyGUIfor(fragmentType);
         }
         int titleResId;
         switch (fragmentType){
             case MAP:
                 mNavView.setCheckedItem(R.id.nav_map_item);
                 titleResId = R.string.map;
                 break;
             case FAVORITES:
                 mNavView.setCheckedItem(R.id.nav_favorites_item);
                 titleResId = R.string.nav_favorites_text;
                 break;
             case ARRIVALS:
                 titleResId = R.string.nav_arrivals_text;
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case STOPS:
                 titleResId = R.string.stop_search_view_title;
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case MAIN_SCREEN_FRAGMENT:
             case NEARBY_STOPS:
             case NEARBY_ARRIVALS:
                 titleResId=R.string.app_name_full;
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             default:
                 titleResId = 0;
         }
         if(getSupportActionBar()!=null && titleResId!=0)
             getSupportActionBar().setTitle(titleResId);
     }
 
     @Override
     public void requestArrivalsForStopID(String ID) {
         //register if the request came from the main fragment or not
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         showingMainFragmentFromOther = (probableFragment==null);
 
         if (showingMainFragmentFromOther){
             FragmentManager fraMan = getSupportFragmentManager();
             Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
             if(fragment!=null){
                 //the fragment is there but not shown
                 probableFragment = (MainScreenFragment) fragment;
                 // set the flag
                 probableFragment.setSuppressArrivalsReload(true);
                 showMainFragment(fraMan, probableFragment);
             } else {
                 // we have no fragment
                 probableFragment = createAndShowMainFragment();
             }
         }
         probableFragment.requestArrivalsForStopID(ID);
         mNavView.setCheckedItem(R.id.nav_arrivals);
     }
 
     @Override
     public void toggleSpinner(boolean state) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.toggleSpinner(state);
         }
     }
 
     @Override
     public void enableRefreshLayout(boolean yes) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.enableRefreshLayout(yes);
         }
     }
 
     @Override
     public void showMapCenteredOnStop(Stop stop) {
         createAndShowMapFragment(stop);
     }
 
     //Map Fragment stuff
     void createAndShowMapFragment(@Nullable Stop stop){
         FragmentManager fm = getSupportFragmentManager();
         FragmentTransaction ft = fm.beginTransaction();
         MapFragment fragment = stop == null? MapFragment.getInstance(): MapFragment.getInstance(stop);
         ft.replace(R.id.mainActContentFrame, fragment, MapFragment.FRAGMENT_TAG);
         ft.addToBackStack(null);
         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         ft.commit();
     }
 
     class ToolbarItemClickListener implements Toolbar.OnMenuItemClickListener{
         private final Context activityContext;
 
         public ToolbarItemClickListener(Context activityContext) {
             this.activityContext = activityContext;
         }
 
         @Override
         public boolean onMenuItemClick(MenuItem item) {
             switch (item.getItemId()) {
                 case R.id.action_about:
                     startActivity(new Intent(ActivityPrincipal.this, ActivityAbout.class));
                     return true;
                 case R.id.action_hack:
                     openIceweasel(getString(R.string.hack_url), activityContext);
                     return true;
                 case R.id.action_source:
                     openIceweasel("https://gitpull.it/source/libre-busto/", activityContext);
                     return true;
                 case R.id.action_licence:
                     openIceweasel("https://www.gnu.org/licenses/gpl-3.0.html", activityContext);
                     return true;
                 default:
             }
             return false;
         }
     }
 }
diff --git a/src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java b/src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java
index e1bdcab..b5bc5f3 100644
--- a/src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java
+++ b/src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java
@@ -1,428 +1,429 @@
 /*
 	BusTO  - Backend components
     Copyright (C) 2018 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.backend;
 
 import androidx.annotation.Nullable;
 import android.util.Log;
 import it.reyboz.bustorino.data.GTTInfoInject;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class FiveTAPIFetcher implements ArrivalsFetcher{
 
     private static final String DEBUG_NAME = "FiveTAPIFetcher";
     private final Map<String,String> defaultHeaders = getDefaultHeaders();
     final static LinkedList<String> apiDays = new LinkedList<>(Arrays.asList("dom","lun","mar","mer","gio","ven","sab"));
 
     @Override
     public Palina ReadArrivalTimesAll(String stopID, AtomicReference<Result> res) {
         //set the date for the request as now
 
         Palina p = new Palina(stopID);
 
         //request parameters
         String response = performAPIRequest(QueryType.ARRIVALS,stopID,res);
 
         if(response==null) {
             if(res.get()== Result.SERVER_ERROR_404) {
                 Log.w(DEBUG_NAME,"Got 404, either the server failed, or the stop was not found, or the address is wrong");
                 res.set(Result.EMPTY_RESULT_SET);
             }
             return p;
         }
         List<Route> routes = parseArrivalsServerResponse(response, res);
         if(res.get()==Result.OK) {
             for (Route r : routes) {
                 p.addRoute(r);
             }
             p.sortRoutes();
         }
         return p;
     }
 
     @Override
     public Passaggio.Source getSourceForFetcher() {
         return Passaggio.Source.FiveTAPI;
     }
 
     List<Route> parseArrivalsServerResponse(String JSONresponse, AtomicReference<Result> res){
         ArrayList<Route> routes = new ArrayList<>(3);
         /*
          Slight problem:
          "longName": ==> DESCRIPTION
         "name": "13N",
         "departures": [
             {
                 "arrivalTimeInt": 1272,
                 "time": "21:12",
                 "rt": false
             }]
         "lineType": "URBANO" ==> URBANO can be either bus or tram or METRO
          */
         JSONArray arr;
         try{
             arr = new JSONArray(JSONresponse);
             String type;
             Route.Type routetype = Route.Type.UNKNOWN;
             for(int i =0; i<arr.length();i++){
                 JSONObject lineJSON = arr.getJSONObject(i);
                 String lineName=FiveTNormalizer.routeDisplayToInternal(lineJSON.getString("name"));
                 if(lineJSON.has("lineType")) {
                     type = lineJSON.getString("lineType");
 
                     //set the type of line
                     if(type.equals("EXTRA"))
                         routetype = Route.Type.LONG_DISTANCE_BUS;
                     else routetype = Route.Type.BUS;
                 }
 
 
                 //Cut out the spaces in the line Name
                 //temporary fix
                 //lineName = lineName.replace(" ","").replace("/","B");
 
                 //TODO: parse the line description
                 Route r = new Route(lineName,routetype,lineJSON.getString("longName"));
                 //Log.d(DEBUG_NAME,"Creating line with name "+lineJSON.getString("name")+" and description "+lineJSON.getString("longName"));
                 final JSONArray passagesJSON = lineJSON.getJSONArray("departures");
 
                 for(int j=0;j<passagesJSON.length();j++){
                     final JSONObject arrival = passagesJSON.getJSONObject(j);
                     final String passaggio = Passaggio.createPassaggioGTT(arrival.getString("time"),arrival.getBoolean("rt"));
                     r.addPassaggio(passaggio, Passaggio.Source.FiveTAPI);
                     //Log.d(DEBUG_NAME,"Adding passage with time "+arrival.getString("time")+"\nrealtime="+arrival.getBoolean("rt"));
                 }
                 routes.add(r);
             }
 
         } catch (JSONException e) {
             e.printStackTrace();
             res.set(Result.PARSER_ERROR);
             return routes;
         }
         Collections.sort(routes);
         res.set(Result.OK);
         return routes;
     }
 
 
     public List<Route> parseDirectionsFromResponse(String response) throws IllegalArgumentException,JSONException{
-        if(response == null || response.length()==0) throw new IllegalArgumentException("Response string is null or void");
+        if(response == null || response.equals("null") || response.length()==0)
+            throw new IllegalArgumentException("Response string is null or void");
         ArrayList<Route> routes = new ArrayList<>(10);
             JSONArray lines =new JSONArray(response);
             for(int i=0; i<lines.length();i++){
                 Route.FestiveInfo festivo = Route.FestiveInfo.UNKNOWN;
                 final JSONObject branchJSON = lines.getJSONObject(i);
                 final int branchid = branchJSON.getInt("branch");
                 String description = branchJSON.getString("description");
                 if(description.contains(" fittizi")){
                     //this means that the branch is fake
                     continue;
                 }
                 String direction = branchJSON.getString("direction");
 
                 String lineName = branchJSON.getString("lineName");
                 Route.Type t = Route.Type.UNKNOWN;
                 //parsing description
                 String[] exploded = description.split(",");
                 description = exploded[exploded.length-1]; //the real description
                 int[]  serviceDays = {};
                 if(exploded.length > 1) {
                     String secondo = exploded[exploded.length-2];
                     if (secondo.contains("festivo")) {
                         festivo = Route.FestiveInfo.FESTIVO;
                     } else if (secondo.contains("feriale")) {
                         festivo = Route.FestiveInfo.FERIALE;
                     } else if(secondo.contains("lun. - ven")) {
                         serviceDays = Route.reduced_week;
                     } else if(secondo.contains("sab - fest.")){
                         serviceDays = Route.weekend;
                         festivo = Route.FestiveInfo.FESTIVO;
                     } else {
                         /*
                         Log.d(DEBUG_NAME,"Parsing details of line "+lineName+" branchid "+branchid+":\n\t"+
                                 "Couldn't find a the service days\n"+
                                 "Description: "+secondo+","+description
                         );
                          */
                     }
                     if(exploded.length>2){
                         switch (exploded[exploded.length-3].trim()) {
                             case "bus":
                                 t = Route.Type.BUS;
                                 break;
                             case "tram":
                                 //never happened, but if it could happen you can get it
                                 t = Route.Type.TRAM;
                                 break;
                             default:
                                 //nothing
                         }
 
                     }
                 } else //only one piece
                     if(description.contains("festivo")){
                         festivo = Route.FestiveInfo.FESTIVO;
                     } else if(description.contains("feriale")){
                         festivo = Route.FestiveInfo.FERIALE;
                     }
                 if(t == Route.Type.UNKNOWN &&(lineName.trim().equals("10")|| lineName.trim().equals("15"))) t= Route.Type.TRAM;
                 //check for the presence of parenthesis
                 String preParenthesis, postParenthesis;
                 boolean hasParenth = false;
                 if (description.contains("(")){
                     hasParenth =true;
                     preParenthesis = description.split("\\(")[0];
                     postParenthesis = description.split("\\(")[1];
                 } else {
                     preParenthesis = description;
                     postParenthesis = "";
                 }
                 if(preParenthesis.contains("-")){
                     //Sometimes the actual filtered direction still remains the full line (including both extremes)
                     preParenthesis = preParenthesis.split("-")[1];
                 }
                 final String directionFinal = hasParenth? preParenthesis.trim() + " (" + postParenthesis : preParenthesis;
                 Route r = new Route(lineName.trim(),directionFinal.trim(),t,new ArrayList<>());
                 if(serviceDays.length>0) r.serviceDays = serviceDays;
                 r.festivo = festivo;
                 r.branchid = branchid;
                 r.description = description.trim();
                 //check if we have the stop list
                 if (branchJSON.has("branchDetail")) {
                     final String stops = branchJSON.getJSONObject("branchDetail").getString("stops");
                     r.setStopsList(Arrays.asList(stops.split(",")));
                 }
 
                 routes.add(r);
             }
 
         return routes;
     }
 
     public List<Route> getDirectionsForStop(String stopID, AtomicReference<Result> res) {
 
         String response = performAPIRequest(QueryType.DETAILS,stopID,res);
         List<Route> routes;
         try{
             routes = parseDirectionsFromResponse(response);
             res.set(Result.OK);
         } catch (JSONException | IllegalArgumentException e) {
             e.printStackTrace();
             res.set(Result.PARSER_ERROR);
             routes = null;
         }
         return routes;
     }
     public ArrayList<Stop> getAllStopsFromGTT(AtomicReference<Result> res){
 
         String response = performAPIRequest(QueryType.STOPS_ALL,null,res);
         if(response==null) return null;
         ArrayList<Stop> stopslist;
         try{
             //JSONObject responseJSON = new JSONObject(response);
             JSONArray stops = new JSONArray(response);//responseJSON.getJSONArray("stops");
             stopslist = new ArrayList<>(stops.length());
             for (int i=0;i<stops.length();i++){
                 JSONObject currentStop = stops.getJSONObject(i);
                 String location = currentStop.getString("location");
                 if(location.trim().equals("_")) location = null;
                 String placeName = currentStop.getString("placeName");
                 if(placeName.trim().equals("_")) placeName = null;
                 String[] lines = currentStop.getString("lines").split(",");
                 for(int l = 0; l<lines.length;l++){
                     lines[l] = FiveTNormalizer.routeDisplayToInternal(lines[l]);
                 }
                 Route.Type t;
                 switch (currentStop.getString("type")){
                     case "BUS":
                         t = Route.Type.BUS;
                         break;
                     case "METRO":
                         t = Route.Type.METRO;
                         break;
                     case "TRENO":
                         t = Route.Type.RAILWAY;
                         break;
                     default:
                         t = Route.Type.UNKNOWN;
                 }
                 String stopName = currentStop.getString("name");
                 String stopID;
                 if(stopName.toLowerCase().contains("metro"))
                     t= Route.Type.METRO;
                 try {
                     stopID = currentStop.getString("id");
                 } catch (JSONException exc){
                     // we don't have the ID
                     //check if we have it already as hardcoded
                     stopID = GTTInfoInject.findIDWhenMissingByName(stopName);
                     if(stopID.length()==0){
                         // we haven't found it, skip stop
                         Log.e(DEBUG_NAME, "Cannot find the ID for stop name: "+stopName);
                         continue;
                     }
                 }
                 Stop s = new Stop(stopID, stopName,
                         null,location,t,Arrays.asList(lines),
                         Double.parseDouble(currentStop.getString("lat")),
                         Double.parseDouble(currentStop.getString("lng")));
                 if(placeName!=null)
                 s.setAbsurdGTTPlaceName(placeName);
                 stopslist.add(s);
             }
             res.set(Result.OK);
 
         } catch (JSONException e) {
             e.printStackTrace();
             res.set(Result.PARSER_ERROR);
             return null;
         }
 
         return stopslist;
     }
 
     @Nullable
     public ArrayList<Route> getAllLinesFromGTT(AtomicReference<Result> res){
 
         String resp = performAPIRequest(QueryType.LINES,null,res);
         if(resp==null) {
             return null;
         }
 
         ArrayList<Route> routes = null;
         try {
             JSONArray lines = new JSONArray(resp);
             routes = new ArrayList<>(lines.length());
             for(int i = 0; i<lines.length(); i++) {
                 JSONObject lineJ = lines.getJSONObject(i);
                 Route.Type t;
                 switch(lineJ.getString("azienda")){
                     case "EXTRA":
                         t = Route.Type.LONG_DISTANCE_BUS;
                         break;
                     case "URBANO":
                         t = Route.Type.BUS;
                         break;
                     case "FERRO":
                         t = Route.Type.RAILWAY;
                         break;
                     default:
                         t = Route.Type.UNKNOWN;
                 }
                 String name = lineJ.getString("name");
                 routes.add(new Route(name,t,lineJ.getString("longName")));
 
             }
             //finish
             res.set(Result.OK);
         } catch (JSONException e) {
             e.printStackTrace();
             res.set(Result.PARSER_ERROR);
             return routes;
         }
 
         return routes;
     }
 
     /**
      * Useful to get all the headers for the GTT server
      * @return the request headers
      */
     public static Map<String, String> getDefaultHeaders(){
         HashMap<String, String> param = new HashMap<>();
         param.put("Host","www.5t.torino.it");
         param.put("Connection","Keep-Alive");
         param.put("Accept-Encoding", "gzip");
         return param;
     }
 
     /**
      * Create and perform the network request. This method adds parameters and returns the result
      * @param t type of request to be performed
      * @param stopID optional parameter, stop ID which you need for passages and branches
      * @param res  result  container
      * @return a String which contains the result of the query, to be parsed
      */
     @Nullable
     public static String performAPIRequest(QueryType t,@Nullable String stopID, AtomicReference<Result> res){
         URL u;
         Map<String,String> param;
 
         try {
             String address  = getURLForOperation(t,stopID);
             //Log.d(DEBUG_NAME,"The address to query is: "+address);
             param = getDefaultHeaders();
             u = new URL(address);
         } catch (UnsupportedEncodingException |MalformedURLException e) {
             e.printStackTrace();
             res.set(Result.PARSER_ERROR);
             return null;
         }
         String response = networkTools.queryURL(u,res,param);
 
         return response;
     }
 
     /**
      * Get the right url for the operation you are doing, to be fed into the queryURL method
      * @param t type of operation
      * @param stopID stop on which you are working on
      * @return the Url to go to
      * @throws UnsupportedEncodingException if it cannot be converted to utf-8
      */
     public static String getURLForOperation(QueryType t,@Nullable String stopID) throws UnsupportedEncodingException {
         final StringBuilder sb = new StringBuilder();
         sb.append("http://www.5t.torino.it/ws2.1/rest/");
         if(t!=QueryType.LINES) sb.append("stops/");
         switch (t){
             case ARRIVALS:
                 sb.append(URLEncoder.encode(stopID,"utf-8"));
                 sb.append("/departures");
                 break;
             case DETAILS:
                 sb.append(URLEncoder.encode(stopID,"utf-8"));
                 sb.append("/branches/details");
                 break;
             case STOPS_ALL:
                 sb.append("all");
                 break;
             case STOPS_VERSION:
                 sb.append("version");
                 break;
             case LINES:
                 sb.append("lines/all");
                 break;
         }
         return sb.toString();
     }
 
 
 
     public enum QueryType {
         ARRIVALS, DETAILS,STOPS_ALL, STOPS_VERSION,LINES
     }
 }
diff --git a/src/it/reyboz/bustorino/backend/Palina.java b/src/it/reyboz/bustorino/backend/Palina.java
index 966d3d6..3e07757 100644
--- a/src/it/reyboz/bustorino/backend/Palina.java
+++ b/src/it/reyboz/bustorino/backend/Palina.java
@@ -1,354 +1,377 @@
 /*
 	BusTO (backend components)
     Copyright (C) 2016 Ludovico Pavesi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package it.reyboz.bustorino.backend;
 
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
 
 /**
  * Timetable for multiple routes.<br>
  * <br>
  * Apparently "palina" and a bunch of other terms can't really be translated into English.<br>
  * Not in a way that makes sense and keeps the code readable, at least.
  */
 public class Palina extends Stop {
     private ArrayList<Route> routes = new ArrayList<>();
     private boolean routesModified = false;
     private Passaggio.Source allSource = null;
 
     public Palina(String stopID) {
         super(stopID);
     }
 
     public Palina(Stop s){
         super(s.ID,s.getStopDefaultName(),s.getStopUserName(),s.location,s.type,
                 s.getRoutesThatStopHere(),s.getLatitude(),s.getLongitude());
     }
 
 
     /**
      * Adds a timetable entry to a route.
      *
      * @param TimeGTT time in GTT format (e.g. "11:22*")
      * @param arrayIndex position in the array for this route (returned by addRoute)
      */
     public void addPassaggio(String TimeGTT, Passaggio.Source src,int arrayIndex) {
         this.routes.get(arrayIndex).addPassaggio(TimeGTT,src);
         routesModified = true;
     }
 
     /**
      * Count routes with missing directions
      * @return number
      */
     public int countRoutesWithMissingDirections(){
         int i = 0;
         for (Route r : routes){
             if(r.destinazione==null||r.destinazione.equals(""))
                 i++;
         }
         return i;
     }
 
     /**
      * Adds a route to the timetable.
      *
      * @param routeID name
      * @param type bus, underground, railway, ...
      * @param destinazione end of line\terminus (underground stations have the same ID for both directions)
      * @return array index for this route
      */
     public int addRoute(String routeID, String destinazione, Route.Type type) {
         this.routes.add(new Route(routeID, destinazione, type, new ArrayList<>(6)));
         routesModified = true;
         return this.routes.size() - 1; // last inserted element and pray that direct access to ArrayList elements really is direct
     }
     public int addRoute(Route r){
         this.routes.add(r);
         routesModified = true;
         return this.routes.size()-1;
     }
     public void setRoutes(List<Route> routeList){
         routes = new ArrayList<>(routeList);
     }
 
 
 //    /**
 //     * Clears a route timetable (or creates an empty route) and returns its index
 //     *
 //     * @param routeID name
 //     * @param destinazione end of line\terminus
 //     * @return array index for this route
 //     */
 //    public int updateRoute(String routeID, String destinazione) {
 //        int s = this.routes.size();
 //        RouteInternal r;
 //
 //        for(int i = 0; i < s; i++) {
 //            r = routes.get(i);
 //            if(r.name.compareTo(routeID) == 0 && r.destinazione.compareTo(destinazione) == 0) {
 //                // capire se è possibile che ci siano stessa linea e stessa destinazione su 2 righe diverse del sito e qui una sovrascrive l'altra (probabilmente no)
 //                r.updateFlag();
 //                r.deletePassaggio();
 //                return i;
 //            }
 //        }
 //
 //        return this.addRoute(routeID, destinazione);
 //    }
 //
 //    /**
 //     * Deletes routes marked as "not updated" (= disappeared from the GTT website\API\whatever).
 //     * Sets all remaining routes to "not updated" because that's how this contraption works.
 //     */
 //    public void finishUpdatingRoutes() {
 //        RouteInternal r;
 //
 //        for(Iterator<RouteInternal> itr = this.routes.iterator(); itr.hasNext(); ) {
 //            r = itr.next();
 //            if(r.unupdateFlag()) {
 //                itr.remove();
 //            }
 //        }
 //    }
 
 //    /**
 //     * Gets the current timetable for a route. Returns null if the route doesn't exist.
 //     * This is slower than queryRouteByIndex.
 //     *
 //     * @return timetable (passaggi)
 //     */
 //    public List<Passaggio> queryRoute(String routeID) {
 //        for(Route r : this.routes) {
 //            if(routeID.equals(r.name)) {
 //                return r.getPassaggi();
 //            }
 //        }
 //
 //        return null;
 //    }
 //
 //    /**
 //     * Gets the current timetable for this route, from its index in the array.
 //     *
 //     * @return timetable (passaggi)
 //     */
 //    public List<Passaggio> queryRouteByIndex(int index) {
 //        return this.routes.get(index).getPassaggi();
 //    }
     protected void checkPassaggi(){
         Passaggio.Source mSource = null;
         for (Route r: routes){
             for(Passaggio pass: r.passaggi){
                 if (mSource == null) {
                     mSource = pass.source;
                 } else if (mSource != pass.source){
                     Log.w("BusTO-CheckPassaggi",
                             "Cannot determine the source, have got "+mSource +" so far, the next one is "+pass.source );
                     mSource = Passaggio.Source.UNDETERMINED;
 
                     break;
                 }
             }
             if(mSource == Passaggio.Source.UNDETERMINED)
                 break;
         }
         // if the Source is still null, set undetermined
         if (mSource == null) mSource = Passaggio.Source.UNDETERMINED;
         //finished with the check, setting flags
         routesModified = false;
         allSource = mSource;
     }
 
     @NonNull
     public Passaggio.Source getPassaggiSourceIfAny(){
         if(allSource==null || routesModified){
             checkPassaggi();
         }
         assert allSource != null;
         return allSource;
     }
 
     /**
      * Gets every route and its timetable.
      *
      * @return routes and timetables.
      */
     public List<Route> queryAllRoutes() {
         return this.routes;
     }
 
     public void sortRoutes() {
         Collections.sort(this.routes);
     }
 
     /**
      * Add info about the routes already found from another source
      * @param additionalRoutes ArrayList of routes to get the info from
      * @return the number of routes modified
      */
     public int addInfoFromRoutes(List<Route> additionalRoutes){
         if(routes == null || routes.size()==0) {
             this.routes = new ArrayList<>(additionalRoutes);
             return routes.size();
         }
         int count=0;
         final Calendar c = Calendar.getInstance();
         final int todaysInt = c.get(Calendar.DAY_OF_WEEK);
         for(Route r:routes) {
             int j = 0;
             boolean correct = false;
             Route selected = null;
             //TODO: rewrite this as a simple loop
             //MADNESS begins here
             while (!correct) {
                 //find the correct route to merge to
                 // scan routes and find the first which has the same name
                 while (j < additionalRoutes.size() && !r.getName().equals(additionalRoutes.get(j).getName())) {
                     j++;
                 }
                 if (j == additionalRoutes.size()) break; //no match has been found
                 //should have found the first occurrence of the line
                 selected = additionalRoutes.get(j);
                 //move forward
                 j++;
 
 
                 if (selected.serviceDays != null && selected.serviceDays.length > 0) {
                     //check if it is in service
                     for (int d : selected.serviceDays) {
                         if (d == todaysInt) {
                             correct = true;
                             break;
                         }
                     }
                 } else if (r.festivo != null) {
                     switch (r.festivo) {
                         case FERIALE:
                             //Domenica = 1 --> Saturday=7
                             if (todaysInt <= 7 && todaysInt > 1) correct = true;
                             break;
                         case FESTIVO:
                             if (todaysInt == 1) correct = true; //TODO: implement way to recognize all holidays
                             break;
                         case UNKNOWN:
                             correct = true;
                     }
                 } else {
                     //case a: there is no info because the line is always active
                     //case b: there is no info because the information is missing
                     correct = true;
                 }
             }
             if (!correct || selected == null) {
                 Log.w("Palina_mergeRoutes","Cannot match the route with name "+r.getName());
                 continue; //we didn't find any match
             }
             //found the correct correspondance
             //MERGE INFO
             if(r.mergeRouteWithAnother(selected)) count++;
         }
         return count;
     }
 
 //    /**
 //     * Route with terminus (destinazione) and timetables (passaggi), internal implementation.
 //     *
 //     * Contains mostly the same data as the Route public class, but methods are quite different and extending Route doesn't really work, here.
 //     */
 //    private final class RouteInternal {
 //        public final String name;
 //        public final String destinazione;
 //        private boolean updated;
 //        private List<Passaggio> passaggi;
 //
 //        /**
 //         * Creates a new route and marks it as "updated", since it's new.
 //         *
 //         * @param routeID name
 //         * @param destinazione end of line\terminus
 //         */
 //        public RouteInternal(String routeID, String destinazione) {
 //            this.name = routeID;
 //            this.destinazione = destinazione;
 //            this.passaggi = new LinkedList<>();
 //            this.updated = true;
 //        }
 //
 //        /**
 //         * Adds a time (passaggio) to the timetable for this route
 //         *
 //         * @param TimeGTT time in GTT format (e.g. "11:22*")
 //         */
 //        public void addPassaggio(String TimeGTT) {
 //            this.passaggi.add(new Passaggio(TimeGTT));
 //        }
 //
 //        /**
 //         * Deletes al times (passaggi) from the timetable.
 //         */
 //        public void deletePassaggio() {
 //            this.passaggi = new LinkedList<>();
 //            this.updated = true;
 //        }
 //
 //        /**
 //         * Sets the "updated" flag to false.
 //         *
 //         * @return previous state
 //         */
 //        public boolean unupdateFlag() {
 //            if(this.updated) {
 //                this.updated = false;
 //                return true;
 //            } else {
 //                return false;
 //            }
 //        }
 //
 //        /**
 //         * Sets the "updated" flag to true.
 //         *
 //         * @return previous state
 //         */
 //        public boolean updateFlag() {
 //            if(this.updated) {
 //                return true;
 //            } else {
 //                this.updated = true;
 //                return false;
 //            }
 //        }
 //
 //        /**
 //         * Exactly what it says on the tin.
 //         *
 //         * @return times from the timetable
 //         */
 //        public List<Passaggio> getPassaggi() {
 //            return this.passaggi;
 //        }
 //    }
+    //remove duplicates
+
+    public void mergeDuplicateRoutes(int startidx){
+       //ArrayList<Route> routesCopy = new ArrayList<>(routes);
+       //for
+        if(routes.size()<=1|| startidx >= routes.size()) //we have finished
+            return;
+        Route routeCheck = routes.get(startidx);
+        boolean found = false;
+        for(int i=startidx+1; i<routes.size(); i++){
+            final Route r = routes.get(i);
+            if(routeCheck.equals(r)){
+                //we have found a match, merge
+                routes.remove(routeCheck);
+                r.mergeRouteWithAnother(routeCheck);
+                found=true;
+                break;
+            }
+        }
+        if (found) mergeDuplicateRoutes(startidx);
+        else mergeDuplicateRoutes(startidx+1);
+    }
+    //private void mergeRoute
 }
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/backend/Route.java b/src/it/reyboz/bustorino/backend/Route.java
index c093110..70990e2 100644
--- a/src/it/reyboz/bustorino/backend/Route.java
+++ b/src/it/reyboz/bustorino/backend/Route.java
@@ -1,370 +1,382 @@
 /*
 	BusTO (backend components)
     Copyright (C) 2016 Ludovico Pavesi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package it.reyboz.bustorino.backend;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
 
 public class Route implements Comparable<Route> {
     final static int[] reduced_week = {Calendar.MONDAY,Calendar.TUESDAY,Calendar.WEDNESDAY,Calendar.THURSDAY,Calendar.FRIDAY};
     final static int[] feriali = {Calendar.MONDAY,Calendar.TUESDAY,Calendar.WEDNESDAY,Calendar.THURSDAY,Calendar.FRIDAY,Calendar.SATURDAY};
     final static int[] weekend = {Calendar.SUNDAY,Calendar.SATURDAY};
     private final static int BRANCHID_MISSING = -1;
 
     private final String name;
     public String destinazione;
     public final List<Passaggio> passaggi;
     //create a copy of the list, so that
     private List<Passaggio> sortedPassaggi;
     public final Type type;
     public String description;
     //ordered list of stops, from beginning to end of line
     private List<String> stopsList = null;
     public int branchid = BRANCHID_MISSING;
     public int[] serviceDays ={};
     //0=>feriale, 1=>festivo -2=>unknown
     public FestiveInfo festivo = FestiveInfo.UNKNOWN;
 
 
     public enum Type { // "long distance" sono gli extraurbani.
         BUS(1), LONG_DISTANCE_BUS(2), METRO(3), RAILWAY(4), TRAM(5), UNKNOWN(-2);
         //TODO: decide to give some special parameter to each field
         private int code;
         Type(int code){
             this.code = code;
         }
         public int getCode(){
             return this.code;
         }
         @Nullable
         public static Type fromCode(int i){
             switch (i){
                 case 1:
                     return BUS;
                 case 2:
                     return LONG_DISTANCE_BUS;
                 case 3:
                     return METRO;
                 case 4:
                     return RAILWAY;
                 case 5:
                     return TRAM;
                 case -2:
                     return UNKNOWN;
                 default:
                     return null;
             }
         }
     }
     public enum FestiveInfo{
         FESTIVO(1),FERIALE(0),UNKNOWN(-2);
 
         private int code;
         FestiveInfo(int code){
             this.code = code;
         }
 
         public int getCode() {
             return code;
         }
         public static FestiveInfo fromCode(int i){
             switch (i){
                 case -2:
                     return UNKNOWN;
                 case 0:
                     return FERIALE;
                 case 1:
                     return FESTIVO;
                 default:
                     return UNKNOWN;
             }
         }
     }
     /**
      * Constructor.
      *
      * @param name route ID
      * @param destinazione terminus\end of line
      * @param type bus, long distance bus, underground, and so on
      * @param passaggi timetable, a good choice is an ArrayList of size 6
      * @param description the description of the line, usually given by the FiveTAPIFetcher
      * @see Palina Palina.addRoute() method
      */
     public Route(String name, String destinazione, List<Passaggio> passaggi, Type type, String description) {
         this.name = name;
         this.destinazione = parseDestinazione(destinazione);
         this.passaggi = passaggi;
         this.type = type;
         this.description = description;
     }
 
     /**
      * Constructor used in GTTJSONFetcher, see above
      */
     public Route(String name, String destinazione, Type type, List<Passaggio> passaggi) {
         this(name,destinazione,passaggi,type,null);
     }
 
     /**
      * Constructor used by the FiveTAPIFetcher
      * @param name stop Name
      * @param t optional type
      * @param description line rough description
      */
     public Route(String name,Type t,String description){
         this(name,null,new ArrayList<>(),t,description);
     }
 
     /**
      * Exactly what it says on the tin.
      *
      * @return times from the timetable
      */
     public List<Passaggio> getPassaggi() {
         return this.passaggi;
     }
 
     public void setStopsList(List<String> stopsList) {
         this.stopsList = Collections.unmodifiableList(stopsList);
     }
     public List<String> getStopsList(){
         return this.stopsList;
     }
 
     /**
      * Adds a time (passaggio) to the timetable for this route
      *
      * @param TimeGTT time in GTT format (e.g. "11:22*")
      */
      public void addPassaggio(String TimeGTT, Passaggio.Source source) {
          this.passaggi.add(new Passaggio(TimeGTT, source));
      }
      //Overloaded
      public void addPassaggio(int hour, int minutes, boolean realtime, Passaggio.Source source) {
          this.passaggi.add(new Passaggio(hour, minutes, realtime, source));
      }
 
     public static Route.Type getTypeFromSymbol(String route) {
         switch (route) {
             case "M":
                 return Route.Type.METRO;
             case "T":
                 return Route.Type.RAILWAY;
         }
 
         // default with case "B"
         return Route.Type.BUS;
     }
 
      private String parseDestinazione(String direzione){
          if(direzione==null) return null;
          //trial to add space to the parenthesis
          String[] exploded = direzione.split("\\(");
          if(exploded.length>1){
              StringBuilder sb = new StringBuilder();
              sb.append(exploded[0]);
              for(int i=1; i<exploded.length;i++) {
                  sb.append(" (");
                  sb.append(exploded[i]);
              }
              direzione = sb.toString();
          }
          return direzione;
      }
 
     /**
      * Getter for the name
      * @return the name of the line
      */
      public String getName() {
         return name;
      }
 
      public String getNameForDisplay(){
          if(name.trim().equals("101Metrobus")) return "101 Metrobus";
          else return name;
      }
      /**
      * Get all passaggi in a single string
      * @return the string
      */
      public String getPassaggiToString(){
          StringBuilder sb = new StringBuilder();
          for(Passaggio passaggio : passaggi) {
              // "+" calls concat() and some other stuff internally, this should be faster
              //StringBuilder is THE WAY
              sb.append(passaggio.toString());
              sb.append(" ");
          }
          return sb.toString();
      }
 
      public String getPassaggiToString(int start_idx, int number, boolean sort){
          StringBuilder sb = new StringBuilder();
          List<Passaggio> arrivals;
          int max;
          if(sort){
              if(sortedPassaggi==null){
                  sortedPassaggi = new ArrayList<>(passaggi.size());
                  sortedPassaggi.addAll(passaggi);
                  Collections.sort(sortedPassaggi);
              }
              arrivals = sortedPassaggi;
          } else  arrivals = passaggi;
          max = Math.min(start_idx + number, arrivals.size());
          for(int j= start_idx; j<max;j++) {
              // "+" calls concat() and some other stuff internally, this should be faster
              //StringBuilder is THE WAY
              sb.append(arrivals.get(j).toString());
              sb.append(" ");
          }
          return sb.toString();
      }
 
 
     @Override
     public int compareTo(@NonNull Route other) {
         int res;
         int thisAsInt, otherAsInt;
 
         // sorting by numbers alone yields a far more "natural" result (36N goes before 2024, 95B next to 95, and the like)
 
         thisAsInt = networkTools.failsafeParseInt(this.name.replaceAll("[^0-9]", ""));
         otherAsInt = networkTools.failsafeParseInt(other.name.replaceAll("[^0-9]", ""));
 
         // compare.
 
         // numeric route IDs (names)
         if(thisAsInt != 0 && otherAsInt != 0) {
             res = thisAsInt - otherAsInt;
             if(res != 0) {
                 return res;
             }
         } else {
             // non-numeric
             res = this.name.compareTo(other.name);
             if (res != 0) {
                 return res;
             }
         }
 
         // try comparing their destination
         if(this.destinazione!=null){
             res = this.destinazione.compareTo(other.destinazione);
             if(res != 0) {
                 return res;
             }
         }
 
         //compare the lines
         if(this.stopsList!=null && other.stopsList!=null){
             int d = this.stopsList.size()-other.stopsList.size();
             if(d!=0) return d;
-            else {
-                //the two have the same number of stops
-
-            }
+            //if we are here, the two routes have the same number of stops
         }
         // probably useless, but... last attempt.
 
         if(this.type != other.type) {
             // ordinal() is evil or whatever, who cares.
             return this.type.ordinal() - other.type.ordinal();
         }
 
         return 0;
     }
 
     public boolean isBranchIdValid(){
          return branchid!=BRANCHID_MISSING;
     }
 
     @Override
     public boolean equals(Object obj) {
          if(obj instanceof Route){
              Route r = (Route) obj;
              boolean result  = false;
              if(this.name.equals(r.name) && this.branchid == r.branchid){
+                 if(description!=null && r.description!=null)
+                     if(!description.trim().equals(r.description.trim()))
+                         return false;
+                 if(destinazione!=null && r.destinazione!=null){
+                         if(!this.destinazione.trim().equals(r.destinazione.trim()))
+                             // they are not the same
+                             return false;
+                 }
+                 //check stops list
                  if(this.stopsList!=null && r.stopsList!=null){
-                     int d = this.stopsList.size()-r.stopsList.size();
-                     if(d!=0) {
-                         result = false;
+                     int sizeDiff = this.stopsList.size()-r.stopsList.size();
+                     if(sizeDiff!=0) {
+                         return false;
+
                      } else {
+                         //check that the stops are the same
                          result = true;
                          for(int j=0; j<this.stopsList.size();j++){
                              if(!this.stopsList.get(j).equals(r.stopsList.get(j))) {
                                 result = false;
                                 break;
                              }
                         }
+                         return result;
                      }
+                 } else{
+                     //no stopsList in one or the other
+                     return true;
                  }
              }
              return result;
 
          } else return false;
     }
 
     /**
      * Merge informations from another route
      * NO CONSISTENCY CHECKS, DO BEFORE CALLING THIS METHOD
      * @param other the other route
      * @return true if there have been changes
      */
     public boolean mergeRouteWithAnother(Route other){
          boolean adjusted = false;
         if ((other.serviceDays!=null && this.serviceDays!=null && this.serviceDays.length==0)
                 || (other.serviceDays!=null && this.serviceDays==null)) {
             this.serviceDays = other.serviceDays;
             adjusted = true;
         }
         if (other.getStopsList() != null && this.getStopsList() == null)
             this.setStopsList(other.getStopsList());
 
-        if(this.passaggi!=null && other.passaggi!=null && this.passaggi.size()==0 && other.passaggi.size()>0){
+        if(this.passaggi!=null && other.passaggi!=null && other.passaggi.size()>0){
             this.passaggi.addAll(other.passaggi);
         }
 
         if(this.destinazione == null && other.destinazione!=null) {
             this.destinazione = other.destinazione;
             adjusted = true;
         }
         if(!this.isBranchIdValid() && other.isBranchIdValid()) {
             this.branchid = other.branchid;
             adjusted = true;
         }
         if(this.festivo == Route.FestiveInfo.UNKNOWN && other.festivo!= Route.FestiveInfo.UNKNOWN){
             this.festivo = other.festivo;
             adjusted = true;
         }
         if(other.description!=null && (this.description==null ||
                 (this.festivo == FestiveInfo.FERIALE && this.description.contains("festivo")) ||
                 (this.festivo == FestiveInfo.FESTIVO && this.description.contains("feriale")) )  ) {
             this.description = other.description;
         }
 
          return adjusted;
     }
 
 }
diff --git a/src/it/reyboz/bustorino/data/StopsDB.java b/src/it/reyboz/bustorino/data/StopsDB.java
deleted file mode 100644
index 9ea5bf1..0000000
--- a/src/it/reyboz/bustorino/data/StopsDB.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
-	BusTO ("backend" components)
-    Copyright (C) 2016 Ludovico Pavesi
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package it.reyboz.bustorino.data;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.readystatesoftware.sqliteasset.SQLiteAssetHelper;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import it.reyboz.bustorino.backend.Route;
-import it.reyboz.bustorino.backend.Stop;
-import it.reyboz.bustorino.backend.StopsDBInterface;
-
-
-public class StopsDB extends SQLiteAssetHelper implements StopsDBInterface {
-    private static String QUERY_TABLE_stops = "stops";
-    private static String QUERY_WHERE_ID = "ID = ?";
-    private static String QUERY_WHERE_LAT_AND_LNG_IN_RANGE = "lat >= ? AND lat <= ? AND lon >= ? AND lon <= ?";
-    private static String[] QUERY_COLUMN_name = {"name"};
-    private static final String[] QUERY_COLUMN_location = {"location"};
-    private static final String[] QUERY_COLUMN_route = {"route"};
-    private static final String[] QUERY_COLUMN_everything = {"name", "location", "type", "lat", "lon"};
-    private static final String[] QUERY_COLUMN_everything_and_ID = {"ID", "name", "location", "type", "lat", "lon"};
-
-    private static String DB_NAME = "stops.sqlite";
-    private static int DB_VERSION = 1;
-    private SQLiteDatabase db;
-    private AtomicInteger openCounter = new AtomicInteger();
-
-    public StopsDB(Context context) {
-        super(context, DB_NAME, null, DB_VERSION);
-        // WARNING: do not remove the following line, do not save anything in this database, it will be overwritten on every update!
-        setForcedUpgrade();
-
-        // remove old database (BusTo version 1.8.5 and below)
-        File filename = new File(context.getFilesDir(), "busto.sqlite");
-        if(filename.exists()) {
-            //noinspection ResultOfMethodCallIgnored
-            filename.delete();
-        }
-    }
-
-    /**
-     * Through the magic of an atomic counter, the database gets opened and closed without race
-     * conditions between threads (HOPEFULLY).
-     *
-     * @return database or null if cannot be opened
-     */
-    @Nullable
-    public synchronized SQLiteDatabase openIfNeeded() {
-        openCounter.incrementAndGet();
-        this.db = getReadableDatabase();
-        return this.db;
-    }
-
-    /**
-     * Through the magic of an atomic counter, the database gets really closed only when no thread
-     * is using it anymore (HOPEFULLY).
-     */
-    public synchronized void closeIfNeeded() {
-        // is anybody still using the database or can we close it?
-        if(openCounter.decrementAndGet() <= 0) {
-            super.close();
-            this.db = null;
-        }
-    }
-
-    public List<String> getRoutesByStop(@NonNull String stopID) {
-        String[] uselessArray = {stopID};
-        int count;
-        Cursor result;
-
-        if(this.db == null) {
-            return null;
-        }
-
-        try {
-            result = this.db.query("routemap", QUERY_COLUMN_route, "stop = ?", uselessArray, null, null, null);
-        } catch(SQLiteException e) {
-            return null;
-        }
-
-        count = result.getCount();
-        if(count == 0) {
-            return null;
-        }
-
-        List<String> routes = new ArrayList<>(count);
-
-        while(result.moveToNext()) {
-            routes.add(result.getString(0));
-        }
-
-        result.close();
-
-        return routes;
-    }
-
-    public String getLocationFromID(@NonNull String stopID) {
-        String[] uselessArray = {stopID};
-        int count;
-        String name;
-        Cursor result;
-
-        if(this.db == null) {
-            return null;
-        }
-
-        try {
-            result = this.db.query(QUERY_TABLE_stops, QUERY_COLUMN_location, QUERY_WHERE_ID, uselessArray, null, null, null);
-        } catch(SQLiteException e) {
-            return null;
-        }
-
-        count = result.getCount();
-        if(count == 0) {
-            return null;
-        }
-
-        result.moveToNext();
-        name = result.getString(0);
-
-        result.close();
-
-        return name;
-    }
-
-    public Stop getAllFromID(@NonNull String stopID) {
-        Cursor result;
-        int count;
-        Stop s;
-
-        if(this.db == null) {
-            return null;
-        }
-
-        try {
-            result = this.db.query(QUERY_TABLE_stops, QUERY_COLUMN_everything, QUERY_WHERE_ID, new String[] {stopID}, null, null, null);
-            int colName = result.getColumnIndex("name");
-            int colLocation = result.getColumnIndex("location");
-            int colType = result.getColumnIndex("type");
-            int colLat = result.getColumnIndex("lat");
-            int colLon = result.getColumnIndex("lon");
-
-            count = result.getCount();
-            if(count == 0) {
-                return null;
-            }
-
-            result.moveToNext();
-
-            Route.Type type = routeTypeFromSymbol(result.getString(colType));
-
-            String locationWhichSometimesIsAnEmptyString = result.getString(colLocation);
-            if(locationWhichSometimesIsAnEmptyString.length() <= 0) {
-                locationWhichSometimesIsAnEmptyString = null;
-            }
-
-            s = new Stop(stopID, result.getString(colName), null, locationWhichSometimesIsAnEmptyString, type, getRoutesByStop(stopID), result.getDouble(colLat), result.getDouble(colLon));
-        } catch(SQLiteException e) {
-            return null;
-        }
-
-        result.close();
-
-        return s;
-    }
-
-    /**
-     * Query some bus stops inside a map view
-     *
-     * You can obtain the coordinates from OSMDroid using something like this:
-     *  BoundingBoxE6 bb = mMapView.getBoundingBox();
-     *  double latFrom = bb.getLatSouthE6() / 1E6;
-     *  double latTo = bb.getLatNorthE6() / 1E6;
-     *  double lngFrom = bb.getLonWestE6() / 1E6;
-     *  double lngTo = bb.getLonEastE6() / 1E6;
-     */
-    public Stop[] queryAllInsideMapView(double minLat, double maxLat, double minLng, double maxLng) {
-        Stop[] stops = new Stop[0];
-
-        Cursor result;
-        int count;
-
-        // coordinates must be strings in the where condition
-        String minLatRaw = String.valueOf(minLat);
-        String maxLatRaw = String.valueOf(maxLat);
-        String minLngRaw = String.valueOf(minLng);
-        String maxLngRaw = String.valueOf(maxLng);
-
-        String stopID;
-        Route.Type type;
-
-        if(this.db == null) {
-            return stops;
-        }
-
-        try {
-            result = this.db.query(QUERY_TABLE_stops, QUERY_COLUMN_everything_and_ID, QUERY_WHERE_LAT_AND_LNG_IN_RANGE, new String[] {minLatRaw, maxLatRaw, minLngRaw, maxLngRaw}, null, null, null);
-
-            int colID = result.getColumnIndex("ID");
-            int colName = result.getColumnIndex("name");
-            int colLocation = result.getColumnIndex("location");
-            int colType = result.getColumnIndex("type");
-            int colLat = result.getColumnIndex("lat");
-            int colLon = result.getColumnIndex("lon");
-
-            count = result.getCount();
-            stops = new Stop[count];
-
-            int i = 0;
-            while(result.moveToNext()) {
-
-                stopID = result.getString(colID);
-                type = routeTypeFromSymbol(result.getString(colType));
-
-                String locationWhichSometimesIsAnEmptyString = result.getString(colLocation);
-                if (locationWhichSometimesIsAnEmptyString.length() <= 0) {
-                    locationWhichSometimesIsAnEmptyString = null;
-                }
-
-                stops[i++] = new Stop(stopID, result.getString(colName), null,
-                        locationWhichSometimesIsAnEmptyString, type, getRoutesByStop(stopID),
-                        result.getDouble(colLat), result.getDouble(colLon));
-            }
-
-        } catch(SQLiteException e) {
-            // TODO: put a warning in the log
-            return stops;
-        }
-
-        result.close();
-
-        return stops;
-    }
-
-    /**
-     * Get a Route Type from its char symbol
-     *
-     * @param route The route symbol (e.g. "B")
-     * @return The related Route.Type (e.g. Route.Type.Bus)
-     */
-    public static Route.Type routeTypeFromSymbol(String route) {
-        switch (route) {
-            case "M":
-                return Route.Type.METRO;
-            case "T":
-                return Route.Type.RAILWAY;
-        }
-
-        // default with case "B"
-        return Route.Type.BUS;
-    }
-}
diff --git a/src/it/reyboz/bustorino/fragments/MainScreenFragment.java b/src/it/reyboz/bustorino/fragments/MainScreenFragment.java
index bbf9f2e..50828b5 100644
--- a/src/it/reyboz/bustorino/fragments/MainScreenFragment.java
+++ b/src/it/reyboz/bustorino/fragments/MainScreenFragment.java
@@ -1,703 +1,717 @@
 
 package it.reyboz.bustorino.fragments;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.location.Criteria;
 import android.location.Location;
 import android.os.Build;
 import android.os.Bundle;
 
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.zxing.integration.android.IntentIntegrator;
 
 import java.util.Map;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.*;
 import it.reyboz.bustorino.middleware.AppLocationManager;
 import it.reyboz.bustorino.middleware.AsyncDataDownload;
 import it.reyboz.bustorino.util.LocationCriteria;
 import it.reyboz.bustorino.util.Permissions;
 
 import static it.reyboz.bustorino.util.Permissions.LOCATION_PERMISSIONS;
 import static it.reyboz.bustorino.util.Permissions.LOCATION_PERMISSION_GIVEN;
 
 
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link MainScreenFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
 public class MainScreenFragment extends BaseFragment implements  FragmentListenerMain{
 
 
     private static final String OPTION_SHOW_LEGEND = "show_legend";
     private static final String SAVED_FRAGMENT="saved_fragment";
 
     private static final String DEBUG_TAG = "BusTO - MainFragment";
 
     public final static String FRAGMENT_TAG = "MainScreenFragment";
 
     /// UI ELEMENTS //
     private ImageButton addToFavorites;
     private FragmentHelper fragmentHelper;
     private SwipeRefreshLayout swipeRefreshLayout;
     private EditText busStopSearchByIDEditText;
     private EditText busStopSearchByNameEditText;
     private ProgressBar progressBar;
     private TextView howDoesItWorkTextView;
     private Button hideHintButton;
     private MenuItem actionHelpMenuItem;
     private FloatingActionButton floatingActionButton;
 
     private boolean setupOnAttached = true;
     private boolean suppressArrivalsReload = false;
     //private Snackbar snackbar;
     /*
      * Search mode
      */
     private static final int SEARCH_BY_NAME = 0;
     private static final int SEARCH_BY_ID = 1;
     private static final int SEARCH_BY_ROUTE = 2; // TODO: implement this -- https://gitpull.it/T12
     private int searchMode;
     //private ImageButton addToFavorites;
     private final ArrivalsFetcher[] arrivalsFetchers = new ArrivalsFetcher[]{new FiveTAPIFetcher(), new GTTJSONFetcher(), new FiveTScraperFetcher()};
     //// HIDDEN BUT IMPORTANT ELEMENTS ////
     FragmentManager fragMan;
     Handler mainHandler;
     private final Runnable refreshStop = new Runnable() {
         public void run() {
+            if(getContext() == null) return;
             if (fragMan.findFragmentById(R.id.resultFrame) instanceof ArrivalsFragment) {
                 ArrivalsFragment fragment = (ArrivalsFragment) fragMan.findFragmentById(R.id.resultFrame);
                 if (fragment == null){
                     //we create a new fragment, which is WRONG
                     new AsyncDataDownload(fragmentHelper, arrivalsFetchers,getContext()).execute();
                 } else{
                     String stopName = fragment.getStopID();
 
                     new AsyncDataDownload(fragmentHelper, fragment.getCurrentFetchersAsArray(), getContext()).execute(stopName);
                 }
             } else //we create a new fragment, which is WRONG
                 new AsyncDataDownload(fragmentHelper, arrivalsFetchers, getContext()).execute();
         }
     };
 
     /// LOCATION STUFF ///
     boolean pendingNearbyStopsRequest = false;
     boolean locationPermissionGranted, locationPermissionAsked = false;
     AppLocationManager locationManager;
 
 
     private final LocationCriteria cr = new LocationCriteria(2000, 10000);
     //Location
     private AppLocationManager.LocationRequester requester = new AppLocationManager.LocationRequester() {
         @Override
         public void onLocationChanged(Location loc) {
 
         }
 
         @Override
         public void onLocationStatusChanged(int status) {
 
             if(status == AppLocationManager.LOCATION_GPS_AVAILABLE && !isNearbyFragmentShown()){
                 //request Stops
                 pendingNearbyStopsRequest = false;
-
-                mainHandler.post(new NearbyStopsRequester(getContext(), cr));
+                if (getContext()!= null)
+                    mainHandler.post(new NearbyStopsRequester(getContext(), cr));
             }
         }
 
         @Override
         public long getLastUpdateTimeMillis() {
             return 50;
         }
 
         @Override
         public LocationCriteria getLocationCriteria() {
             return cr;
         }
 
         @Override
         public void onLocationProviderAvailable() {
             //Log.w(DEBUG_TAG, "pendingNearbyStopRequest: "+pendingNearbyStopsRequest);
-            if(!isNearbyFragmentShown()){
+            if(!isNearbyFragmentShown() && getContext()!=null){
                 pendingNearbyStopsRequest = false;
                 mainHandler.post(new NearbyStopsRequester(getContext(), cr));
             }
         }
 
         @Override
         public void onLocationDisabled() {
 
         }
     };
     private final ActivityResultLauncher<String[]> requestPermissionLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
                 @Override
                 public void onActivityResult(Map<String, Boolean> result) {
                     if(result==null || result.get(Manifest.permission.ACCESS_COARSE_LOCATION) == null
                     ||result.get(Manifest.permission.ACCESS_FINE_LOCATION) ) return;
 
                     if(result.get(Manifest.permission.ACCESS_COARSE_LOCATION) && result.get(Manifest.permission.ACCESS_FINE_LOCATION)){
                         locationPermissionGranted = true;
                         Log.w(DEBUG_TAG, "Starting position");
                         if (mListener!= null && getContext()!=null){
                             if (locationManager==null)
                                 locationManager = AppLocationManager.getInstance(getContext());
                             locationManager.addLocationRequestFor(requester);
                         }
                     }
                 }
             });
 
 
     //// ACTIVITY ATTACHED (LISTENER ///
     private CommonFragmentListener mListener;
 
     private String pendingStopID = null;
 
     public MainScreenFragment() {
         // Required empty public constructor
     }
 
 
     public static MainScreenFragment newInstance() {
         MainScreenFragment fragment = new MainScreenFragment();
         Bundle args = new Bundle();
         //args.putString(ARG_PARAM1, param1);
         //args.putString(ARG_PARAM2, param2);
         fragment.setArguments(args);
         return fragment;
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             //do nothing
         }
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View root = inflater.inflate(R.layout.fragment_main_screen, container, false);
         addToFavorites = (ImageButton) root.findViewById(R.id.addToFavorites);
         busStopSearchByIDEditText = root.findViewById(R.id.busStopSearchByIDEditText);
         busStopSearchByNameEditText = root.findViewById(R.id.busStopSearchByNameEditText);
         progressBar = root.findViewById(R.id.progressBar);
         howDoesItWorkTextView = root.findViewById(R.id.howDoesItWorkTextView);
         hideHintButton = root.findViewById(R.id.hideHintButton);
         swipeRefreshLayout = root.findViewById(R.id.listRefreshLayout);
         floatingActionButton = root.findViewById(R.id.floatingActionButton);
         busStopSearchByIDEditText.setSelectAllOnFocus(true);
         busStopSearchByIDEditText
                 .setOnEditorActionListener((v, actionId, event) -> {
                     // IME_ACTION_SEARCH alphabetical option
                     if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                         onSearchClick(v);
                         return true;
                     }
                     return false;
                 });
         busStopSearchByNameEditText
                 .setOnEditorActionListener((v, actionId, event) -> {
                     // IME_ACTION_SEARCH alphabetical option
                     if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                         onSearchClick(v);
                         return true;
                     }
                     return false;
                 });
 
         swipeRefreshLayout
                 .setOnRefreshListener(() -> mainHandler.post(refreshStop));
         swipeRefreshLayout.setColorSchemeResources(R.color.blue_500, R.color.orange_500);
 
         floatingActionButton.setOnClickListener((this::onToggleKeyboardLayout));
         hideHintButton.setOnClickListener(this::onHideHint);
 
         AppCompatImageButton qrButton = root.findViewById(R.id.QRButton);
         qrButton.setOnClickListener(this::onQRButtonClick);
 
         AppCompatImageButton searchButton = root.findViewById(R.id.searchButton);
         searchButton.setOnClickListener(this::onSearchClick);
 
         // Fragment stuff
         fragMan = getChildFragmentManager();
         fragMan.addOnBackStackChangedListener(() -> Log.d("BusTO Main Fragment", "BACK STACK CHANGED"));
 
         fragmentHelper = new FragmentHelper(this, getChildFragmentManager(), getContext(), R.id.resultFrame);
         setSearchModeBusStopID();
 
 
         cr.setAccuracy(Criteria.ACCURACY_FINE);
         cr.setAltitudeRequired(false);
         cr.setBearingRequired(false);
         cr.setCostAllowed(true);
         cr.setPowerRequirement(Criteria.NO_REQUIREMENT);
 
        locationManager = AppLocationManager.getInstance(getContext());
 
         Log.d(DEBUG_TAG, "OnCreateView, savedInstanceState null: "+(savedInstanceState==null));
 
 
 
         return root;
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         Log.d(DEBUG_TAG, "onViewCreated, SwipeRefreshLayout visible: "+(swipeRefreshLayout.getVisibility()==View.VISIBLE));
         Log.d(DEBUG_TAG, "Setup on attached: "+setupOnAttached);
         //Restore instance state
         if (savedInstanceState!=null){
             Fragment fragment = getChildFragmentManager().getFragment(savedInstanceState, SAVED_FRAGMENT);
             if (fragment!=null){
                 getChildFragmentManager().beginTransaction().add(R.id.resultFrame, fragment).commit();
                 setupOnAttached = false;
             }
         }
         if (getChildFragmentManager().findFragmentById(R.id.resultFrame)!= null){
             swipeRefreshLayout.setVisibility(View.VISIBLE);
         }
     }
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         Fragment fragment = getChildFragmentManager().findFragmentById(R.id.resultFrame);
         if (fragment!=null)
         getChildFragmentManager().putFragment(outState, SAVED_FRAGMENT, fragment);
         fragmentHelper.setBlockAllActivities(true);
     }
 
     public void setSuppressArrivalsReload(boolean value){
        suppressArrivalsReload = value;
         // we have to suppress the reloading of the (possible) ArrivalsFragment
         /*if(value) {
             Fragment fragment = getChildFragmentManager().findFragmentById(R.id.resultFrame);
             if (fragment instanceof ArrivalsFragment) {
                 ArrivalsFragment frag = (ArrivalsFragment) fragment;
                 frag.setReloadOnResume(false);
             }
         }
 
          */
     }
 
+    /**
+     * Cancel the reload of the arrival times
+     * because we are going to pop the fragment
+     */
+    public void cancelReloadArrivalsIfNeeded(){
+        if(getContext()==null) return; //we are not attached
+
+        //Fragment fr = getChildFragmentManager().findFragmentById(R.id.resultFrame);
+        fragmentHelper.stopLastRequestIfNeeded();
+        toggleSpinner(false);
+    }
+
 
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         Log.d(DEBUG_TAG, "OnAttach called, setupOnAttach: "+setupOnAttached);
         mainHandler = new Handler();
         if (context instanceof CommonFragmentListener) {
             mListener = (CommonFragmentListener) context;
         } else {
-            throw new RuntimeException(context.toString()
+            throw new RuntimeException(context
                     + " must implement CommonFragmentListener");
         }
         if (setupOnAttached) {
             if (pendingStopID==null)
             //We want the nearby bus stops!
             mainHandler.post(new NearbyStopsRequester(context, cr));
             else{
                 ///TODO: if there is a stop displayed, we need to hold the update
             }
 
             setupOnAttached = false;
         }
 
 
     }
     @Override
     public void onDetach() {
         super.onDetach();
         mListener = null;
     //    setupOnAttached = true;
     }
 
 
     @Override
     public void onResume() {
 
         final Context con = getContext();
         Log.w(DEBUG_TAG, "OnResume called");
         if (con != null) {
             if(locationManager==null)
                 locationManager = AppLocationManager.getInstance(con);
 
             if(Permissions.locationPermissionGranted(con)){
                 Log.d(DEBUG_TAG, "Location permission OK");
                 if(!locationManager.isRequesterRegistered(requester))
                     locationManager.addLocationRequestFor(requester);
             } else if(shouldShowRequestPermissionRationale(Manifest.permission.ACCESS_FINE_LOCATION)){
                 //we have already asked for the location, and we should show an explanation in order
                 // to ask again (TODO)
                 //do nothing
             } else{
                 //request permission
                 requestPermissionLauncher.launch(Permissions.LOCATION_PERMISSIONS);
             }
         }
         else {
             Log.w(DEBUG_TAG, "Context is null at onResume");
         }
         super.onResume();
         // if we have a pending stopID request, do it
         Log.d(DEBUG_TAG, "Pending stop ID for arrivals: "+pendingStopID);
         //this is the second time we are attaching this fragment
         Log.d(DEBUG_TAG, "Waiting for new stop request: "+ suppressArrivalsReload);
         if (suppressArrivalsReload){
             // we have to suppress the reloading of the (possible) ArrivalsFragment
             Fragment fragment = getChildFragmentManager().findFragmentById(R.id.resultFrame);
             if (fragment instanceof ArrivalsFragment){
                 ArrivalsFragment frag = (ArrivalsFragment) fragment;
                 frag.setReloadOnResume(false);
             }
             suppressArrivalsReload = false;
         }
         if(pendingStopID!=null){
             requestArrivalsForStopID(pendingStopID);
             pendingStopID = null;
         }
         mListener.readyGUIfor(FragmentKind.MAIN_SCREEN_FRAGMENT);
 
         fragmentHelper.setBlockAllActivities(false);
     }
 
     @Override
     public void onPause() {
         //mainHandler = null;
         locationManager.removeLocationRequestFor(requester);
         super.onPause();
         fragmentHelper.setBlockAllActivities(true);
         fragmentHelper.stopLastRequestIfNeeded();
     }
 
+
     /*
     GUI METHODS
      */
     /**
      * QR scan button clicked
      *
      * @param v View QRButton clicked
      */
     public void onQRButtonClick(View v) {
         IntentIntegrator integrator = new IntentIntegrator(getActivity());
         integrator.initiateScan();
     }
     public void onHideHint(View v) {
 
         hideHints();
         setOption(OPTION_SHOW_LEGEND, false);
     }
     /**
      * OK this is pure shit
      *
      * @param v View clicked
      */
     public void onSearchClick(View v) {
         final StopsFinderByName[] stopsFinderByNames = new StopsFinderByName[]{new GTTStopsFetcher(), new FiveTStopsFetcher()};
         if (searchMode == SEARCH_BY_ID) {
             String busStopID = busStopSearchByIDEditText.getText().toString();
             requestArrivalsForStopID(busStopID);
         } else { // searchMode == SEARCH_BY_NAME
             String query = busStopSearchByNameEditText.getText().toString();
             //new asyncWgetBusStopSuggestions(query, stopsDB, StopsFindersByNameRecursionHelper);
-            new AsyncDataDownload(fragmentHelper, stopsFinderByNames, getContext()).execute(query);
+            if(getContext()!=null)
+                new AsyncDataDownload(fragmentHelper, stopsFinderByNames, getContext()).execute(query);
         }
     }
 
-
     public void onToggleKeyboardLayout(View v) {
 
         if (searchMode == SEARCH_BY_NAME) {
             setSearchModeBusStopID();
             if (busStopSearchByIDEditText.requestFocus()) {
                 showKeyboard();
             }
         } else { // searchMode == SEARCH_BY_ID
             setSearchModeBusStopName();
             if (busStopSearchByNameEditText.requestFocus()) {
                 showKeyboard();
             }
         }
 
     }
     @Override
     public void enableRefreshLayout(boolean yes) {
         swipeRefreshLayout.setEnabled(yes);
     }
 
     ////////////////////////////////////// GUI HELPERS /////////////////////////////////////////////
     public void showKeyboard() {
         if(getActivity() == null) return;
         InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
         View view = searchMode == SEARCH_BY_ID ? busStopSearchByIDEditText : busStopSearchByNameEditText;
         imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
     }
 
     private void setSearchModeBusStopID() {
         searchMode = SEARCH_BY_ID;
         busStopSearchByNameEditText.setVisibility(View.GONE);
         busStopSearchByNameEditText.setText("");
         busStopSearchByIDEditText.setVisibility(View.VISIBLE);
         floatingActionButton.setImageResource(R.drawable.alphabetical);
     }
 
     private void setSearchModeBusStopName() {
         searchMode = SEARCH_BY_NAME;
         busStopSearchByIDEditText.setVisibility(View.GONE);
         busStopSearchByIDEditText.setText("");
         busStopSearchByNameEditText.setVisibility(View.VISIBLE);
         floatingActionButton.setImageResource(R.drawable.numeric);
     }
     protected boolean isNearbyFragmentShown(){
         Fragment fragment = getChildFragmentManager().findFragmentByTag(NearbyStopsFragment.FRAGMENT_TAG);
         return (fragment!= null && fragment.isVisible());
     }
 
     /**
      * Having that cursor at the left of the edit text makes me cancer.
      *
      * @param busStopID bus stop ID
      */
     private void setBusStopSearchByIDEditText(String busStopID) {
         busStopSearchByIDEditText.setText(busStopID);
         busStopSearchByIDEditText.setSelection(busStopID.length());
     }
 
     private void showHints() {
         howDoesItWorkTextView.setVisibility(View.VISIBLE);
         hideHintButton.setVisibility(View.VISIBLE);
         //actionHelpMenuItem.setVisible(false);
     }
 
     private void hideHints() {
         howDoesItWorkTextView.setVisibility(View.GONE);
         hideHintButton.setVisibility(View.GONE);
         //actionHelpMenuItem.setVisible(true);
     }
 
     @Override
     public void toggleSpinner(boolean enable) {
         if (enable) {
             //already set by the RefreshListener when needed
             //swipeRefreshLayout.setRefreshing(true);
             progressBar.setVisibility(View.VISIBLE);
         } else {
             swipeRefreshLayout.setRefreshing(false);
             progressBar.setVisibility(View.GONE);
         }
     }
 
 
     private void prepareGUIForBusLines() {
         swipeRefreshLayout.setEnabled(true);
         swipeRefreshLayout.setVisibility(View.VISIBLE);
         //actionHelpMenuItem.setVisible(true);
     }
 
     private void prepareGUIForBusStops() {
         swipeRefreshLayout.setEnabled(false);
         swipeRefreshLayout.setVisibility(View.VISIBLE);
         //actionHelpMenuItem.setVisible(false);
     }
 
     void showNearbyStopsFragment(){
         swipeRefreshLayout.setVisibility(View.VISIBLE);
         NearbyStopsFragment fragment = NearbyStopsFragment.newInstance(NearbyStopsFragment.TYPE_STOPS);
         Fragment oldFrag = fragMan.findFragmentById(R.id.resultFrame);
         FragmentTransaction ft = fragMan.beginTransaction();
         if (oldFrag != null)
             ft.remove(oldFrag);
         ft.add(R.id.resultFrame, fragment, NearbyStopsFragment.FRAGMENT_TAG);
         ft.commit();
     }
 
 
     @Override
     public void showFloatingActionButton(boolean yes) {
         mListener.showFloatingActionButton(yes);
     }
 
     /**
      * This provides a temporary fix to make the transition
      * to a single asynctask go smoother
      *
      * @param fragmentType the type of fragment created
      */
     @Override
     public void readyGUIfor(FragmentKind fragmentType) {
 
         hideKeyboard();
 
         //if we are getting results, already, stop waiting for nearbyStops
         if (pendingNearbyStopsRequest && (fragmentType == FragmentKind.ARRIVALS || fragmentType == FragmentKind.STOPS)) {
             locationManager.removeLocationRequestFor(requester);
             pendingNearbyStopsRequest = false;
         }
 
         if (fragmentType == null) Log.e("ActivityMain", "Problem with fragmentType");
         else
             switch (fragmentType) {
                 case ARRIVALS:
                     prepareGUIForBusLines();
                     if (getOption(OPTION_SHOW_LEGEND, true)) {
                         showHints();
                     }
                     break;
                 case STOPS:
                     prepareGUIForBusStops();
                     break;
                 default:
                     Log.d(DEBUG_TAG, "Fragment type is unknown");
                     return;
             }
         // Shows hints
 
 
     }
 
     @Override
     public void showMapCenteredOnStop(Stop stop) {
         if(mListener!=null) mListener.showMapCenteredOnStop(stop);
     }
 
     /**
      * Main method for stops requests
      * @param ID the Stop ID
      */
     @Override
     public void requestArrivalsForStopID(String ID) {
         if (!isResumed()){
             //defer request
             pendingStopID = ID;
             Log.d(DEBUG_TAG, "Deferring update for stop "+ID);
             return;
         }
         final boolean delayedRequest = !(pendingStopID==null);
         final FragmentManager framan = getChildFragmentManager();
         if (getContext()==null){
             Log.e(DEBUG_TAG, "Asked for arrivals with null context");
             return;
         }
         if (ID == null || ID.length() <= 0) {
             // we're still in UI thread, no need to mess with Progress
             showToastMessage(R.string.insert_bus_stop_number_error, true);
             toggleSpinner(false);
         } else  if (framan.findFragmentById(R.id.resultFrame) instanceof ArrivalsFragment) {
             ArrivalsFragment fragment = (ArrivalsFragment) framan.findFragmentById(R.id.resultFrame);
             if (fragment != null && fragment.getStopID() != null && fragment.getStopID().equals(ID)){
                 // Run with previous fetchers
                 //fragment.getCurrentFetchers().toArray()
                 new AsyncDataDownload(fragmentHelper,fragment.getCurrentFetchersAsArray(), getContext()).execute(ID);
             } else{
                 new AsyncDataDownload(fragmentHelper, arrivalsFetchers, getContext()).execute(ID);
             }
         }
         else {
             new AsyncDataDownload(fragmentHelper,arrivalsFetchers, getContext()).execute(ID);
             Log.d(DEBUG_TAG, "Started search for arrivals of stop " + ID);
         }
     }
     /////////// LOCATION METHODS //////////
 
     /*
     private void startStopRequest(String provider) {
         Log.d(DEBUG_TAG, "Provider " + provider + " got enabled");
         if (locmgr != null && mainHandler != null && pendingNearbyStopsRequest && locmgr.getProvider(provider).meetsCriteria(cr)) {
 
         }
     }
 
      */
 
     /**
      * Run location requests separately and asynchronously
      */
     class NearbyStopsRequester implements Runnable {
         Context appContext;
         Criteria cr;
 
         public NearbyStopsRequester(Context appContext, Criteria criteria) {
             this.appContext = appContext.getApplicationContext();
             this.cr = criteria;
         }
 
         @Override
         public void run() {
             if(isNearbyFragmentShown()) {
                 //nothing to do
                 Log.w(DEBUG_TAG, "launched nearby fragment request but we already are showing");
                 return;
             }
 
             final boolean isOldVersion = Build.VERSION.SDK_INT < Build.VERSION_CODES.M;
             final boolean noPermission = ActivityCompat.checkSelfPermission(appContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED &&
                     ActivityCompat.checkSelfPermission(appContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED;
 
             //if we don't have the permission, we have to ask for it, if we haven't
             // asked too many times before
             if (noPermission) {
                 if (!isOldVersion) {
                     pendingNearbyStopsRequest = true;
                     //Permissions.assertLocationPermissions(appContext,getActivity());
                     requestPermissionLauncher.launch(LOCATION_PERMISSIONS);
                     Log.w(DEBUG_TAG, "Cannot get position: Asking permission, noPositionFromSys: " + noPermission);
                     return;
                 } else {
                     Toast.makeText(appContext, "Asked for permission position too many times", Toast.LENGTH_LONG).show();
                 }
             } else setOption(LOCATION_PERMISSION_GIVEN, true);
 
             AppLocationManager appLocationManager = AppLocationManager.getInstance(appContext);
             final boolean haveProviders = appLocationManager.anyLocationProviderMatchesCriteria(cr);
             if (haveProviders
                     && fragmentHelper.getLastSuccessfullySearchedBusStop() == null
                     && !fragMan.isDestroyed()) {
                 //Go ahead with the request
                 Log.d("mainActivity", "Recreating stop fragment");
                 showNearbyStopsFragment();
                 pendingNearbyStopsRequest = false;
             } else if(!haveProviders){
                 Log.e(DEBUG_TAG, "NO PROVIDERS FOR POSITION");
             }
 
         }
     }
 
 }
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java b/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
index b9f3c56..dd49924 100644
--- a/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
+++ b/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
@@ -1,670 +1,704 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2018 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments;
 
 import android.content.Context;
 
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.location.Location;
 import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 import androidx.core.util.Pair;
 import androidx.preference.PreferenceManager;
 import androidx.appcompat.widget.AppCompatButton;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.android.volley.*;
+import it.reyboz.bustorino.BuildConfig;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.adapters.ArrivalsStopAdapter;
 import it.reyboz.bustorino.backend.*;
 import it.reyboz.bustorino.backend.FiveTAPIFetcher.QueryType;
 import it.reyboz.bustorino.middleware.AppLocationManager;
 import it.reyboz.bustorino.data.AppDataProvider;
 import it.reyboz.bustorino.data.NextGenDB.Contract.*;
 import it.reyboz.bustorino.adapters.SquareStopAdapter;
 import it.reyboz.bustorino.util.LocationCriteria;
 import it.reyboz.bustorino.util.StopSorterByDistance;
 
 import java.util.*;
 
 public class NearbyStopsFragment extends Fragment implements LoaderManager.LoaderCallbacks<Cursor> {
 
     private FragmentListenerMain mListener;
     private FragmentLocationListener fragmentLocationListener;
     private final String[] PROJECTION = {StopsTable.COL_ID,StopsTable.COL_LAT,StopsTable.COL_LONG,
             StopsTable.COL_NAME,StopsTable.COL_TYPE,StopsTable.COL_LINES_STOPPING};
     private final static String DEBUG_TAG = "NearbyStopsFragment";
     private final static String FRAGMENT_TYPE_KEY = "FragmentType";
     public final static int TYPE_STOPS = 19, TYPE_ARRIVALS = 20;
     private int fragment_type;
 
     public final static String FRAGMENT_TAG="NearbyStopsFrag";
 
     //data Bundle
     private final String BUNDLE_LOCATION =  "location";
     private final int LOADER_ID = 0;
     private RecyclerView gridRecyclerView;
 
     private SquareStopAdapter dataAdapter;
     private AutoFitGridLayoutManager gridLayoutManager;
     boolean canStartDBQuery = true;
     private Location lastReceivedLocation = null;
     private ProgressBar circlingProgressBar,flatProgressBar;
     private int distance;
     protected SharedPreferences globalSharedPref;
     private SharedPreferences.OnSharedPreferenceChangeListener preferenceChangeListener;
     private TextView messageTextView,titleTextView;
     private CommonScrollListener scrollListener;
     private AppCompatButton switchButton;
     private boolean firstLocForStops = true,firstLocForArrivals = true;
     public static final int COLUMN_WIDTH_DP = 250;
 
 
     private Integer MAX_DISTANCE = -3;
     private int MIN_NUM_STOPS = -1;
     private int TIME_INTERVAL_REQUESTS = -1;
     private AppLocationManager locManager;
 
     //These are useful for the case of nearby arrivals
     private ArrivalsManager arrivalsManager = null;
     private ArrivalsStopAdapter arrivalsStopAdapter = null;
 
     public NearbyStopsFragment() {
         // Required empty public constructor
     }
 
     /**
      * Use this factory method to create a new instance of
      * this fragment using the provided parameters.
      * @return A new instance of fragment NearbyStopsFragment.
      */
     public static NearbyStopsFragment newInstance(int fragmentType) {
         if(fragmentType != TYPE_STOPS && fragmentType != TYPE_ARRIVALS )
             throw new IllegalArgumentException("WRONG KIND OF FRAGMENT USED");
         NearbyStopsFragment fragment = new NearbyStopsFragment();
         final Bundle args = new Bundle(1);
         args.putInt(FRAGMENT_TYPE_KEY,fragmentType);
         fragment.setArguments(args);
         return fragment;
     }
 
 
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             setFragmentType(getArguments().getInt(FRAGMENT_TYPE_KEY));
         }
         locManager = AppLocationManager.getInstance(getContext());
         fragmentLocationListener = new FragmentLocationListener(this);
         globalSharedPref = getContext().getSharedPreferences(getString(R.string.mainSharedPreferences),Context.MODE_PRIVATE);
 
 
         globalSharedPref.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
 
 
     }
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         if (getContext() == null) throw new RuntimeException();
         View root = inflater.inflate(R.layout.fragment_nearby_stops, container, false);
         gridRecyclerView = root.findViewById(R.id.stopGridRecyclerView);
         gridLayoutManager = new AutoFitGridLayoutManager(getContext().getApplicationContext(), Float.valueOf(utils.convertDipToPixels(getContext(),COLUMN_WIDTH_DP)).intValue());
         gridRecyclerView.setLayoutManager(gridLayoutManager);
         gridRecyclerView.setHasFixedSize(false);
         circlingProgressBar = root.findViewById(R.id.loadingBar);
         flatProgressBar = root.findViewById(R.id.horizontalProgressBar);
         messageTextView = root.findViewById(R.id.messageTextView);
         titleTextView = root.findViewById(R.id.titleTextView);
         switchButton = root.findViewById(R.id.switchButton);
 
         preferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
                 Log.d(DEBUG_TAG,"Key "+key+" was changed");
                 if(key.equals(getString(R.string.databaseUpdatingPref))){
                     if(!sharedPreferences.getBoolean(getString(R.string.databaseUpdatingPref),true)){
                         canStartDBQuery = true;
                         Log.d(DEBUG_TAG,"The database has finished updating, can start update now");
                     }
                 }
             }
         };
         scrollListener = new CommonScrollListener(mListener,false);
         switchButton.setOnClickListener(v -> {
            switchFragmentType();
         });
         Log.d(DEBUG_TAG, "onCreateView");
         return root;
     }
 
     protected ArrayList<Stop> createStopListFromCursor(Cursor data){
         ArrayList<Stop> stopList = new ArrayList<>();
         final int col_id = data.getColumnIndex(StopsTable.COL_ID);
         final int latInd = data.getColumnIndex(StopsTable.COL_LAT);
         final int lonInd = data.getColumnIndex(StopsTable.COL_LONG);
         final int nameindex = data.getColumnIndex(StopsTable.COL_NAME);
         final int typeIndex = data.getColumnIndex(StopsTable.COL_TYPE);
         final int linesIndex = data.getColumnIndex(StopsTable.COL_LINES_STOPPING);
 
         data.moveToFirst();
         for(int i=0; i<data.getCount();i++){
             String[] routes = data.getString(linesIndex).split(",");
 
             stopList.add(new Stop(data.getString(col_id),data.getString(nameindex),null,null,
                             Route.Type.fromCode(data.getInt(typeIndex)),
                             Arrays.asList(routes), //the routes should be compact, not normalized yet
                             data.getDouble(latInd),data.getDouble(lonInd)
                     )
             );
             //Log.d("NearbyStopsFragment","Got stop with id "+data.getString(col_id)+
             //" and name "+data.getString(nameindex));
             data.moveToNext();
         }
         return stopList;
     }
 
     /**
      * Use this method to set the fragment type
      * @param type the type, TYPE_ARRIVALS or TYPE_STOPS
      */
     private void setFragmentType(int type){
         if(type!=TYPE_ARRIVALS && type !=TYPE_STOPS)
             throw new IllegalArgumentException("type not recognized");
         this.fragment_type = type;
         switch(type){
             case TYPE_ARRIVALS:
 
                 TIME_INTERVAL_REQUESTS = 5*1000;
                 break;
             case TYPE_STOPS:
                 TIME_INTERVAL_REQUESTS = 1000;
 
         }
     }
 
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         /// TODO: RISOLVERE PROBLEMA: il context qui e' l'Activity non il Fragment
         if (context instanceof FragmentListenerMain) {
             mListener = (FragmentListenerMain) context;
         } else {
-            throw new RuntimeException(context.toString()
+            throw new RuntimeException(context
                     + " must implement OnFragmentInteractionListener");
         }
         Log.d(DEBUG_TAG, "OnAttach called");
     }
 
     @Override
     public void onPause() {
         super.onPause();
         canStartDBQuery = false;
 
         gridRecyclerView.setAdapter(null);
         locManager.removeLocationRequestFor(fragmentLocationListener);
         Log.d(DEBUG_TAG,"On paused called");
     }
 
     @Override
     public void onResume() {
         super.onResume();
         canStartDBQuery = !globalSharedPref.getBoolean(getString(R.string.databaseUpdatingPref),false);
         try{
             if(canStartDBQuery) locManager.addLocationRequestFor(fragmentLocationListener);
         } catch (SecurityException ex){
             //ignored
             //try another location provider
         }
         switch(fragment_type){
             case TYPE_STOPS:
                 if(dataAdapter!=null){
                     gridRecyclerView.setAdapter(dataAdapter);
                     circlingProgressBar.setVisibility(View.GONE);
                 }
                 break;
             case TYPE_ARRIVALS:
                 if(arrivalsStopAdapter!=null){
                     gridRecyclerView.setAdapter(arrivalsStopAdapter);
                     circlingProgressBar.setVisibility(View.GONE);
                 }
         }
 
         mListener.enableRefreshLayout(false);
         Log.d(DEBUG_TAG,"OnResume called");
-
+        if(getContext()==null){
+            Log.e(DEBUG_TAG, "NULL CONTEXT, everything is going to crash now");
+            MIN_NUM_STOPS = 5;
+            MAX_DISTANCE = 600;
+            return;
+        }
         //Re-read preferences
         SharedPreferences shpr = PreferenceManager.getDefaultSharedPreferences(getContext().getApplicationContext());
         //For some reason, they are all saved as strings
         MAX_DISTANCE = shpr.getInt(getString(R.string.pref_key_radius_recents),600);
-        MIN_NUM_STOPS = Integer.parseInt(shpr.getString(getString(R.string.pref_key_num_recents),"10"));
+        boolean isMinStopInt = true;
+        try{
+            MIN_NUM_STOPS = shpr.getInt(getString(R.string.pref_key_num_recents), 5);
+        } catch (ClassCastException ex){
+            isMinStopInt = false;
+        }
+        if(!isMinStopInt)
+            try {
+                MIN_NUM_STOPS = Integer.parseInt(shpr.getString(getString(R.string.pref_key_num_recents), "5"));
+            } catch (NumberFormatException ex){
+                MIN_NUM_STOPS = 5;
+            }
+        if(BuildConfig.DEBUG)
+            Log.d(DEBUG_TAG, "Max distance for stops: "+MAX_DISTANCE+
+                    ", Min number of stops: "+MIN_NUM_STOPS);
     }
 
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         gridRecyclerView.setVisibility(View.INVISIBLE);
         gridRecyclerView.addOnScrollListener(scrollListener);
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
         mListener = null;
         if(arrivalsManager!=null) arrivalsManager.cancelAllRequests();
     }
 
     @NonNull
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         //BUILD URI
         lastReceivedLocation = args.getParcelable(BUNDLE_LOCATION);
         Uri.Builder builder =  new Uri.Builder();
         builder.scheme("content").authority(AppDataProvider.AUTHORITY)
                 .appendPath("stops").appendPath("location")
                 .appendPath(String.valueOf(lastReceivedLocation.getLatitude()))
                 .appendPath(String.valueOf(lastReceivedLocation.getLongitude()))
                 .appendPath(String.valueOf(distance)); //distance
         CursorLoader cl = new CursorLoader(getContext(),builder.build(),PROJECTION,null,null,null);
         cl.setUpdateThrottle(2000);
         return cl;
     }
 
 
     @Override
     public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
         if (0 > MAX_DISTANCE) throw new AssertionError();
         //Cursor might be null
+        Log.d(DEBUG_TAG, "Num stops found: "+data.getCount()+", Current distance: "+distance);
         if(data==null){
             Log.e(DEBUG_TAG,"Null cursor, something really wrong happened");
             return;
         }
-        if(!isDBUpdating() && (data.getCount()<MIN_NUM_STOPS || distance<=MAX_DISTANCE)){
+        if(!isDBUpdating() && (data.getCount()<MIN_NUM_STOPS && distance<=MAX_DISTANCE)){
             distance = distance*2;
             Bundle d = new Bundle();
             d.putParcelable(BUNDLE_LOCATION,lastReceivedLocation);
             getLoaderManager().restartLoader(LOADER_ID,d,this);
+            //Log.d(DEBUG_TAG, "Doubling distance now!");
             return;
         }
         Log.d("LoadFromCursor","Number of nearby stops: "+data.getCount());
         ////////
-        ArrayList<Stop> stopList = createStopListFromCursor(data);
+
         if(data.getCount()>0) {
+            ArrayList<Stop> stopList = createStopListFromCursor(data);
+            double minDistance = Double.POSITIVE_INFINITY;
+            for(Stop s: stopList){
+                minDistance = Math.min(minDistance, s.getDistanceFromLocation(lastReceivedLocation));
+            }
+
+
             //quick trial to hopefully always get the stops in the correct order
             Collections.sort(stopList,new StopSorterByDistance(lastReceivedLocation));
             switch (fragment_type){
                 case TYPE_STOPS:
                     showStopsInRecycler(stopList);
                     break;
                 case TYPE_ARRIVALS:
                     arrivalsManager = new ArrivalsManager(stopList);
                     flatProgressBar.setVisibility(View.VISIBLE);
                     flatProgressBar.setProgress(0);
                     flatProgressBar.setIndeterminate(false);
                     //for the moment, be satisfied with only one location
                     //AppLocationManager.getInstance(getContext()).removeLocationRequestFor(fragmentLocationListener);
                     break;
                 default:
             }
 
         } else {
             setNoStopsLayout();
         }
 
     }
 
     @Override
-    public void onLoaderReset(Loader<Cursor> loader) {
+    public void onLoaderReset(@NonNull Loader<Cursor> loader) {
     }
 
     /**
      * To enable targeting from the Button
      */
     public void switchFragmentType(View v){
         switchFragmentType();
     }
 
     /**
      * Call when you need to switch the type of fragment
      */
     private void switchFragmentType(){
         if(fragment_type==TYPE_ARRIVALS){
             setFragmentType(TYPE_STOPS);
             switchButton.setText(getString(R.string.show_arrivals));
             titleTextView.setText(getString(R.string.nearby_stops_message));
             if(arrivalsManager!=null)
                 arrivalsManager.cancelAllRequests();
             if(dataAdapter!=null)
                 gridRecyclerView.setAdapter(dataAdapter);
 
         } else if (fragment_type==TYPE_STOPS){
             setFragmentType(TYPE_ARRIVALS);
             titleTextView.setText(getString(R.string.nearby_arrivals_message));
             switchButton.setText(getString(R.string.show_stops));
             if(arrivalsStopAdapter!=null)
                 gridRecyclerView.setAdapter(arrivalsStopAdapter);
         }
         fragmentLocationListener.lastUpdateTime = -1;
         locManager.removeLocationRequestFor(fragmentLocationListener);
         locManager.addLocationRequestFor(fragmentLocationListener);
     }
 
     //useful methods
     protected boolean isDBUpdating(){
         return globalSharedPref.getBoolean(getString(R.string.databaseUpdatingPref),false);
     }
 
 
     /////// GUI METHODS ////////
     private void showStopsInRecycler(List<Stop> stops){
 
         if(firstLocForStops) {
             dataAdapter = new SquareStopAdapter(stops, mListener, lastReceivedLocation);
             gridRecyclerView.setAdapter(dataAdapter);
             firstLocForStops = false;
         }else {
             dataAdapter.setStops(stops);
             dataAdapter.setUserPosition(lastReceivedLocation);
         }
         dataAdapter.notifyDataSetChanged();
 
         //showRecyclerHidingLoadMessage();
         if (gridRecyclerView.getVisibility() != View.VISIBLE) {
             circlingProgressBar.setVisibility(View.GONE);
             gridRecyclerView.setVisibility(View.VISIBLE);
         }
         messageTextView.setVisibility(View.GONE);
 
         if(mListener!=null) mListener.readyGUIfor(FragmentKind.NEARBY_STOPS);
     }
 
     private void showArrivalsInRecycler(List<Palina> palinas){
         Collections.sort(palinas,new StopSorterByDistance(lastReceivedLocation));
 
         final ArrayList<Pair<Stop,Route>> routesPairList = new ArrayList<>(10);
         //int maxNum = Math.min(MAX_STOPS, stopList.size());
         for(Palina p: palinas){
             //if there are no routes available, skip stop
             if(p.queryAllRoutes().size() == 0) continue;
             for(Route r: p.queryAllRoutes()){
                 //if there are no routes, should not do anything
                 routesPairList.add(new Pair<>(p,r));
             }
         }
+        if (getContext()==null){
+            Log.e(DEBUG_TAG, "Trying to show arrivals in Recycler but we're not attached");
+            return;
+        }
         if(firstLocForArrivals){
             arrivalsStopAdapter = new ArrivalsStopAdapter(routesPairList,mListener,getContext(),lastReceivedLocation);
             gridRecyclerView.setAdapter(arrivalsStopAdapter);
             firstLocForArrivals = false;
         } else {
             arrivalsStopAdapter.setRoutesPairListAndPosition(routesPairList,lastReceivedLocation);
         }
 
         //arrivalsStopAdapter.notifyDataSetChanged();
 
         showRecyclerHidingLoadMessage();
         if(mListener!=null) mListener.readyGUIfor(FragmentKind.NEARBY_ARRIVALS);
 
     }
 
     private void setNoStopsLayout(){
         messageTextView.setVisibility(View.VISIBLE);
         messageTextView.setText(R.string.no_stops_nearby);
         circlingProgressBar.setVisibility(View.GONE);
     }
 
     /**
      * Does exactly what is says on the tin
      */
     private void showRecyclerHidingLoadMessage(){
         if (gridRecyclerView.getVisibility() != View.VISIBLE) {
             circlingProgressBar.setVisibility(View.GONE);
             gridRecyclerView.setVisibility(View.VISIBLE);
         }
         messageTextView.setVisibility(View.GONE);
     }
 
     class ArrivalsManager implements FiveTAPIVolleyRequest.ResponseListener, Response.ErrorListener{
         final HashMap<String,Palina> mStops;
         final Map<String,List<Route>> routesToAdd = new HashMap<>();
         final static String REQUEST_TAG = "NearbyArrivals";
         private final QueryType[] types = {QueryType.ARRIVALS,QueryType.DETAILS};
         final NetworkVolleyManager volleyManager;
-        private final int MAX_ARRIVAL_STOPS =35;
         int activeRequestCount = 0,reqErrorCount = 0, reqSuccessCount=0;
 
         ArrivalsManager(List<Stop> stops){
             mStops = new HashMap<>();
             volleyManager = NetworkVolleyManager.getInstance(getContext());
 
+            int MAX_ARRIVAL_STOPS = 35;
             for(Stop s: stops.subList(0,Math.min(stops.size(), MAX_ARRIVAL_STOPS))){
                 mStops.put(s.ID,new Palina(s));
                 for(QueryType t: types) {
                     final FiveTAPIVolleyRequest req = FiveTAPIVolleyRequest.getNewRequest(t, s.ID, this, this);
                     if (req != null) {
                         req.setTag(REQUEST_TAG);
                         volleyManager.addToRequestQueue(req);
                         activeRequestCount++;
                     }
                 }
             }
             flatProgressBar.setMax(activeRequestCount);
         }
 
 
 
         @Override
         public void onErrorResponse(VolleyError error) {
             if(error instanceof ParseError){
                 //TODO
                 Log.w(DEBUG_TAG,"Parsing error for stop request");
             } else if (error instanceof NetworkError){
                 String s;
                 if(error.networkResponse!=null)
                     s = new String(error.networkResponse.data);
                 else s="";
                 Log.w(DEBUG_TAG,"Network error: "+s);
             }else {
                 Log.w(DEBUG_TAG,"Volley Error: "+error.getMessage());
             }
             if(error.networkResponse!=null){
                 Log.w(DEBUG_TAG, "Error status code: "+error.networkResponse.statusCode);
             }
             //counters
             activeRequestCount--;
             reqErrorCount++;
             flatProgressBar.setProgress(reqErrorCount+reqSuccessCount);
         }
 
         @Override
         public void onResponse(Palina result, QueryType type) {
             //counter for requests
             activeRequestCount--;
             reqSuccessCount++;
 
 
             final Palina palinaInMap = mStops.get(result.ID);
             //palina cannot be null here
             //sorry for the brutal crash when it happens
             if(palinaInMap == null) throw new IllegalStateException("Cannot get the palina from the map");
             //necessary to split the Arrivals and Details cases
             switch (type){
                 case ARRIVALS:
                     palinaInMap.addInfoFromRoutes(result.queryAllRoutes());
                     final List<Route> possibleRoutes = routesToAdd.get(result.ID);
                     if(possibleRoutes!=null) {
                         palinaInMap.addInfoFromRoutes(possibleRoutes);
                         routesToAdd.remove(result.ID);
                     }
                 break;
                 case DETAILS:
                     if(palinaInMap.queryAllRoutes().size()>0){
                         //merge the branches
                         palinaInMap.addInfoFromRoutes(result.queryAllRoutes());
                     } else {
                         routesToAdd.put(result.ID,result.queryAllRoutes());
                     }
                     break;
                 default:
                     throw new IllegalArgumentException("Wrong QueryType in onResponse");
             }
 
             final ArrayList<Palina> outList = new ArrayList<>();
             for(Palina p: mStops.values()){
                 final List<Route> routes = p.queryAllRoutes();
                 if(routes!=null && routes.size()>0) outList.add(p);
             }
             showArrivalsInRecycler(outList);
             flatProgressBar.setProgress(reqErrorCount+reqSuccessCount);
             if(activeRequestCount==0) {
                 flatProgressBar.setIndeterminate(true);
                 flatProgressBar.setVisibility(View.GONE);
             }
         }
         void cancelAllRequests(){
             volleyManager.getRequestQueue().cancelAll(REQUEST_TAG);
             flatProgressBar.setVisibility(View.GONE);
         }
     }
     /**
      * Local locationListener, to use for the GPS
      */
     class FragmentLocationListener implements AppLocationManager.LocationRequester{
 
         LoaderManager.LoaderCallbacks<Cursor> callbacks;
         private int oldLocStatus = -2;
         private LocationCriteria cr;
         private long lastUpdateTime = -1;
 
         public FragmentLocationListener(LoaderManager.LoaderCallbacks<Cursor> callbacks) {
             this.callbacks = callbacks;
         }
 
         @Override
         public void onLocationChanged(Location location) {
             //set adapter
             float accuracy = location.getAccuracy();
             if(accuracy<60 && canStartDBQuery) {
                 distance = 20;
                 final Bundle msgBundle = new Bundle();
                 msgBundle.putParcelable(BUNDLE_LOCATION,location);
                 getLoaderManager().restartLoader(LOADER_ID,msgBundle,callbacks);
             }
             lastUpdateTime = System.currentTimeMillis();
             Log.d("BusTO:NearPositListen","can start loader "+ canStartDBQuery);
         }
 
         @Override
         public void onLocationStatusChanged(int status) {
             switch(status){
                 case AppLocationManager.LOCATION_GPS_AVAILABLE:
                     messageTextView.setVisibility(View.GONE);
+
                     break;
                 case AppLocationManager.LOCATION_UNAVAILABLE:
                     messageTextView.setText(R.string.enableGpsText);
                     messageTextView.setVisibility(View.VISIBLE);
                     break;
                 default:
                     Log.e(DEBUG_TAG,"Location status not recognized");
             }
         }
 
         @Override
         public LocationCriteria getLocationCriteria() {
 
             return new LocationCriteria(120,TIME_INTERVAL_REQUESTS);
         }
 
         @Override
         public long getLastUpdateTimeMillis() {
             return lastUpdateTime;
         }
         void resetUpdateTime(){
             lastUpdateTime = -1;
         }
 
         @Override
         public void onLocationProviderAvailable() {
 
         }
 
         @Override
         public void onLocationDisabled() {
 
         }
     }
 
     /**
      * Simple trick to get an automatic number of columns (from https://www.journaldev.com/13792/android-gridlayoutmanager-example)
      *
      */
      class AutoFitGridLayoutManager extends GridLayoutManager {
 
         private int columnWidth;
         private boolean columnWidthChanged = true;
 
         public AutoFitGridLayoutManager(Context context, int columnWidth) {
             super(context, 1);
 
             setColumnWidth(columnWidth);
         }
 
         public void setColumnWidth(int newColumnWidth) {
             if (newColumnWidth > 0 && newColumnWidth != columnWidth) {
                 columnWidth = newColumnWidth;
                 columnWidthChanged = true;
             }
         }
 
         @Override
         public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
             if (columnWidthChanged && columnWidth > 0) {
                 int totalSpace;
                 if (getOrientation() == VERTICAL) {
                     totalSpace = getWidth() - getPaddingRight() - getPaddingLeft();
                 } else {
                     totalSpace = getHeight() - getPaddingTop() - getPaddingBottom();
                 }
                 int spanCount = Math.max(1, totalSpace / columnWidth);
                 setSpanCount(spanCount);
                 columnWidthChanged = false;
             }
             super.onLayoutChildren(recycler, state);
         }
     }
 }
diff --git a/src/it/reyboz/bustorino/fragments/SettingsFragment.java b/src/it/reyboz/bustorino/fragments/SettingsFragment.java
index 0081c9d..f1dcafb 100644
--- a/src/it/reyboz/bustorino/fragments/SettingsFragment.java
+++ b/src/it/reyboz/bustorino/fragments/SettingsFragment.java
@@ -1,36 +1,127 @@
 package it.reyboz.bustorino.fragments;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.*;
 import it.reyboz.bustorino.R;
 
+import java.lang.ref.WeakReference;
+
 public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final String TAG = SettingsFragment.class.getName();
 
-    SharedPreferences preferences;
+    private static final String DIALOG_FRAGMENT_TAG =
+            "androidx.preference.PreferenceFragment.DIALOG";
+    //private static final
+    Handler mHandler;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mHandler = new Handler();
+        return super.onCreateView(inflater, container, savedInstanceState);
+
+    }
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        //getPreferenceManager().setSharedPreferencesName(getString(R.string.mainSharedPreferences));
+        convertStringPrefToIntIfNeeded(getString(R.string.pref_key_num_recents), getContext());
+
+        getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
         setPreferencesFromResource(R.xml.preferences,rootKey);
-        Context con = getContext();
-        if (con == null){
-            Log.w("SETTINGS FRAGMENT", "context is null");
-            preferences = null;
-        }
-        else
-            preferences = getContext().getSharedPreferences(getString(R.string.mainSharedPreferences), Context.MODE_PRIVATE);
+        /*EditTextPreference editPref = findPreference(getString(R.string.pref_key_num_recents));
+        editPref.setOnBindEditTextListener(editText -> {
+            editText.setInputType(InputType.TYPE_CLASS_NUMBER);
+            editText.setSelection(0,editText.getText().length());
+        });
+         */
+
+
     }
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         Preference pref = findPreference(key);
-        //non so a cosa serva tutto  questo
+        Log.d(TAG,"Preference key "+key+" changed");
+        //sometimes this happens
+        if(getContext()==null) return;
+        /*
+        THIS CODE STAYS COMMENTED FOR FUTURE REFERENCES
+        if (key.equals(getString(R.string.pref_key_num_recents))){
+            //check that is it an int
+
+            String value = sharedPreferences.getString(key,"");
+            boolean valid = value.length() != 0;
+            try{
+                Integer intValue = Integer.parseInt(value);
+            } catch (NumberFormatException ex){
+                valid = false;
+            }
+            if (!valid){
+                Toast.makeText(getContext(), R.string.invalid_number, Toast.LENGTH_SHORT).show();
+                if(pref instanceof EditTextPreference){
+                    EditTextPreference prefEdit = (EditTextPreference) pref;
+                    //Intent intent = prefEdit.getIntent();
+                    Log.d(TAG, "opening preference, dialog showing "+
+                            (getParentFragmentManager().findFragmentByTag(DIALOG_FRAGMENT_TAG)!=null) );
+                    //getPreferenceManager().showDialog(pref);
+                    //onDisplayPreferenceDialog(prefEdit);
+                    mHandler.postDelayed(new DelayedDisplay(prefEdit), 500);
+                }
+
+            }
+        }
+         */
 
         Log.d("BusTO Settings", "changed "+key+"\n "+sharedPreferences.getAll());
 
     }
+
+    private void convertStringPrefToIntIfNeeded(String preferenceKey, Context con){
+        if (con == null) return;
+        SharedPreferences defaultSharedPref = PreferenceManager.getDefaultSharedPreferences(getContext());
+        try{
+
+            Integer val = defaultSharedPref.getInt(preferenceKey, 0);
+        } catch (NumberFormatException | ClassCastException ex){
+            //convert the preference
+            //final String preferenceNumRecents = getString(R.string.pref_key_num_recents);
+            Log.d("Preference - BusTO", "Converting to integer the string preference "+preferenceKey);
+            String currentValue = defaultSharedPref.getString(preferenceKey, "10");
+            int newValue;
+            try{
+                newValue = Integer.parseInt(currentValue);
+            } catch (NumberFormatException e){
+                newValue = 10;
+            }
+            final SharedPreferences.Editor editor  = defaultSharedPref.edit();
+            editor.remove(preferenceKey);
+            editor.putInt(preferenceKey, newValue);
+            editor.apply();
+        }
+    }
+
+    class DelayedDisplay implements Runnable{
+        private final WeakReference<DialogPreference> preferenceWeakReference;
+
+        public DelayedDisplay(DialogPreference preference) {
+            this.preferenceWeakReference = new WeakReference<>(preference);
+        }
+
+        @Override
+        public void run() {
+            if(preferenceWeakReference.get()==null)
+                return;
+
+            getPreferenceManager().showDialog(preferenceWeakReference.get());
+        }
+    }
 }
diff --git a/src/it/reyboz/bustorino/middleware/AsyncDataDownload.java b/src/it/reyboz/bustorino/middleware/AsyncDataDownload.java
index 8c5d52d..b3f5b09 100644
--- a/src/it/reyboz/bustorino/middleware/AsyncDataDownload.java
+++ b/src/it/reyboz/bustorino/middleware/AsyncDataDownload.java
@@ -1,356 +1,363 @@
 /*
 	BusTO (middleware)
     Copyright (C) 2018 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.middleware;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.SQLException;
 import android.net.Uri;
 import android.os.AsyncTask;
 
 import androidx.annotation.NonNull;
 import android.util.Log;
 
 import it.reyboz.bustorino.backend.*;
 import it.reyboz.bustorino.data.AppDataProvider;
 import it.reyboz.bustorino.data.NextGenDB;
 import it.reyboz.bustorino.fragments.FragmentHelper;
 import it.reyboz.bustorino.data.NextGenDB.Contract.*;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.Calendar;
 
 /**
  * This should be used to download data, but not to display it
  */
 public class AsyncDataDownload extends AsyncTask<String, Fetcher.Result,Object>{
 
     private static final String TAG = "BusTO-DataDownload";
     private static final String DEBUG_TAG = TAG;
     private boolean failedAll = false;
 
     private final AtomicReference<Fetcher.Result> res;
     private final RequestType t;
     private String query;
     WeakReference<FragmentHelper> helperRef;
     private final ArrayList<Thread> otherActivities = new ArrayList<>();
     private final Fetcher[] theFetchers;
     private Context context;
     private final boolean replaceFragment;
 
 
     public AsyncDataDownload(FragmentHelper fh, @NonNull Fetcher[] fetchers, Context context) {
         RequestType type;
         helperRef = new WeakReference<>(fh);
         fh.setLastTaskRef(new WeakReference<>(this));
         res = new AtomicReference<>();
         this.context = context.getApplicationContext();
         this.replaceFragment = true;
 
         theFetchers = fetchers;
         if (theFetchers.length < 1){
             throw new IllegalArgumentException("You have to put at least one Fetcher, idiot!");
         }
         if (theFetchers[0] instanceof ArrivalsFetcher){
             type = RequestType.ARRIVALS;
         } else if (theFetchers[0] instanceof StopsFinderByName){
             type = RequestType.STOPS;
         } else{
             type = null;
         }
         t = type;
 
     }
 
     @Override
     protected Object doInBackground(String... params) {
         RecursionHelper<Fetcher> r = new RecursionHelper<>(theFetchers);
         boolean success=false;
         Object result;
         FragmentHelper fh = helperRef.get();
         //If the FragmentHelper is null, that means the activity doesn't exist anymore
         if (fh == null){
             return null;
         }
 
         //Log.d(TAG,"refresh layout reference is: "+fh.isRefreshLayoutReferenceTrue());
         while(r.valid()) {
             if(this.isCancelled()) {
                 return null;
             }
             //get the data from the fetcher
             switch (t){
                 case ARRIVALS:
                     ArrivalsFetcher f = (ArrivalsFetcher) r.getAndMoveForward();
                     Log.d(TAG,"Using the ArrivalsFetcher: "+f.getClass());
 
                     Stop lastSearchedBusStop = fh.getLastSuccessfullySearchedBusStop();
                     Palina p;
                     String stopID;
                     if(params.length>0)
                         stopID=params[0]; //(it's a Palina)
                     else if(lastSearchedBusStop!=null)
                         stopID = lastSearchedBusStop.ID; //(it's a Palina)
                     else {
                         publishProgress(Fetcher.Result.QUERY_TOO_SHORT);
                         return null;
                     }
                     //Skip the FiveTAPIFetcher for the Metro Stops because it shows incomprehensible arrival times
-                    if(f instanceof FiveTAPIFetcher && Integer.parseInt(stopID)>= 8200)
-                        continue;
+                    try {
+                        if (f instanceof FiveTAPIFetcher && Integer.parseInt(stopID) >= 8200)
+                            continue;
+                    } catch (NumberFormatException ex){
+                        Log.e(DEBUG_TAG, "The stop number is not a valid integer, expect failures");
+                    }
                     p= f.ReadArrivalTimesAll(stopID,res);
                     publishProgress(res.get());
                     //if (res.get()!= Fetcher.Result.OK)
                     Log.d(DEBUG_TAG, "Arrivals fetcher: "+f+"\n\tProgress: "+res.get());
 
 
                     if(f instanceof FiveTAPIFetcher){
                         AtomicReference<Fetcher.Result> gres = new AtomicReference<>();
                         List<Route> branches = ((FiveTAPIFetcher) f).getDirectionsForStop(stopID,gres);
                         Log.d(DEBUG_TAG, "FiveTArrivals fetcher: "+f+"\n\tDetails req: "+gres.get());
                         if(gres.get() == Fetcher.Result.OK){
                             p.addInfoFromRoutes(branches);
                             Thread t = new Thread(new BranchInserter(branches, context));
                             t.start();
                             otherActivities.add(t);
 
                         }
                         //put updated values into Database
                     }
 
                     if(lastSearchedBusStop != null && res.get()== Fetcher.Result.OK) {
                         // check that we don't have the same stop
                         if(lastSearchedBusStop.ID.equals(p.ID)) {
                             // searched and it's the same
                             String sn = lastSearchedBusStop.getStopDisplayName();
                             if(sn != null) {
                                 // "merge" Stop over Palina and we're good to go
                                 p.mergeNameFrom(lastSearchedBusStop);
                             }
                         }
                     }
-
+                    p.mergeDuplicateRoutes(0);
+                    if(p.queryAllRoutes().size() == 0)
+                        //skip the rest and go to the next fetcher
+                        continue;
                     result = p;
                     //TODO: find a way to avoid overloading the user with toasts
                     break;
                 case STOPS:
                     StopsFinderByName finder = (StopsFinderByName) r.getAndMoveForward();
 
                     List<Stop> resultList= finder.FindByName(params[0], this.res); //it's a List<Stop>
                     Log.d(TAG,"Using the StopFinderByName: "+finder.getClass());
                     query =params[0];
                     result = resultList; //dummy result
                     break;
                 default:
                     result = null;
             }
             //find if it went well
             if(res.get()== Fetcher.Result.OK) {
                 //wait for other threads to finish
                 for(Thread t: otherActivities){
                     try {
                         t.join();
                     } catch (InterruptedException e) {
                         //do nothing
                     }
                 }
                 return result;
             }
 
         }
         //at this point, we are sure that the result has been negative
         failedAll=true;
 
         return null;
     }
 
     @Override
     protected void onProgressUpdate(Fetcher.Result... values) {
         FragmentHelper fh = helperRef.get();
         if (fh!=null)
         for (Fetcher.Result r : values){
             //TODO: make Toast
             fh.showErrorMessage(r);
         }
         else {
             Log.w(TAG,"We had to show some progress but activity was destroyed");
         }
     }
 
     @Override
     protected void onPostExecute(Object o) {
         FragmentHelper fh = helperRef.get();
 
         if(failedAll || o == null || fh == null){
             //everything went bad
             if(fh!=null) fh.toggleSpinner(false);
             cancel(true);
             //TODO: send message here
             return;
         }
 
         if(isCancelled()) return;
 
         switch (t){
             case ARRIVALS:
                 Palina palina = (Palina) o;
                 fh.createOrUpdateStopFragment(palina, replaceFragment);
                 break;
             case STOPS:
                 //this should never be a problem
                 if(!(o instanceof List<?>)){
                     throw new IllegalStateException();
                 }
                 List<?> list = (List<?>) o;
                 if (list.size() ==0) return;
                 Object firstItem = list.get(0);
                 if(!(firstItem instanceof Stop)) return;
                 ArrayList<Stop> stops = new ArrayList<>();
                 for(Object x: list){
                     if(x instanceof Stop) stops.add((Stop) x);
                 }
                 if(list.size() != stops.size()){
                     Log.w(DEBUG_TAG, "Wrong stop list size:\n incoming: "+
                             list.size()+" out: "+stops.size());
                 }
                 //List<Stop> stopList = (List<Stop>) list;
                 if(query!=null && !isCancelled()) {
                     fh.createStopListFragment(stops,query, replaceFragment);
                 } else Log.e(TAG,"QUERY NULL, COULD NOT CREATE FRAGMENT");
                 break;
             case DBUPDATE:
                 break;
         }
     }
 
     @Override
     protected void onCancelled() {
         FragmentHelper fh = helperRef.get();
         if (fh!=null) fh.toggleSpinner(false);
     }
 
     @Override
     protected void onPreExecute() {
         FragmentHelper fh = helperRef.get();
         if (fh!=null) fh.toggleSpinner(true);
     }
 
 
     public enum RequestType {
         ARRIVALS,STOPS,DBUPDATE
     }
 
     public static class BranchInserter implements Runnable{
         private final List<Route> routesToInsert;
 
         private final Context context;
         //private final NextGenDB nextGenDB;
 
         public BranchInserter(List<Route> routesToInsert,@NonNull Context con) {
             this.routesToInsert = routesToInsert;
             this.context = con.getApplicationContext();
             //nextGenDB = new NextGenDB(context);
         }
 
         @Override
         public void run() {
             final NextGenDB nextGenDB = new NextGenDB(context);
             //ContentValues[] values = new ContentValues[routesToInsert.size()];
             ArrayList<ContentValues> branchesValues = new ArrayList<>(routesToInsert.size()*4);
             ArrayList<ContentValues> connectionsVals = new ArrayList<>(routesToInsert.size()*4);
             long starttime,endtime;
             for (Route r:routesToInsert){
                 //if it has received an interrupt, stop
                 if(Thread.interrupted()) return;
                 //otherwise, build contentValues
                 final ContentValues cv = new ContentValues();
                 cv.put(BranchesTable.COL_BRANCHID,r.branchid);
                 cv.put(LinesTable.COLUMN_NAME,r.getName());
                 cv.put(BranchesTable.COL_DIRECTION,r.destinazione);
                 cv.put(BranchesTable.COL_DESCRIPTION,r.description);
                 for (int day :r.serviceDays) {
                     switch (day){
                         case Calendar.MONDAY:
                             cv.put(BranchesTable.COL_LUN,1);
                             break;
                         case Calendar.TUESDAY:
                             cv.put(BranchesTable.COL_MAR,1);
                             break;
                         case Calendar.WEDNESDAY:
                             cv.put(BranchesTable.COL_MER,1);
                             break;
                         case Calendar.THURSDAY:
                             cv.put(BranchesTable.COL_GIO,1);
                             break;
                         case Calendar.FRIDAY:
                             cv.put(BranchesTable.COL_VEN,1);
                             break;
                         case Calendar.SATURDAY:
                             cv.put(BranchesTable.COL_SAB,1);
                             break;
                         case Calendar.SUNDAY:
                             cv.put(BranchesTable.COL_DOM,1);
                             break;
                     }
                 }
                 if(r.type!=null) cv.put(BranchesTable.COL_TYPE, r.type.getCode());
                 cv.put(BranchesTable.COL_FESTIVO, r.festivo.getCode());
 
                 //values[routesToInsert.indexOf(r)] = cv;
                 branchesValues.add(cv);
                 if(r.getStopsList() != null)
                     for(int i=0; i<r.getStopsList().size();i++){
                         String stop = r.getStopsList().get(i);
                         final ContentValues connVal = new ContentValues();
                         connVal.put(ConnectionsTable.COLUMN_STOP_ID,stop);
                         connVal.put(ConnectionsTable.COLUMN_ORDER,i);
                         connVal.put(ConnectionsTable.COLUMN_BRANCH,r.branchid);
 
                         //add to global connVals
                         connectionsVals.add(connVal);
                 }
             }
             starttime = System.currentTimeMillis();
             ContentResolver cr = context.getContentResolver();
             try {
                 cr.bulkInsert(Uri.parse("content://" + AppDataProvider.AUTHORITY + "/branches/"), branchesValues.toArray(new ContentValues[0]));
                 endtime = System.currentTimeMillis();
                 Log.d("DataDownload", "Inserted branches, took " + (endtime - starttime) + " ms");
             } catch (SQLException exc){
                 Log.e("AsyncDataDownload","Inserting data: some error happened, aborting the database insert");
                 exc.printStackTrace();
                 return;
             }
 
             if (connectionsVals.size()>0) {
                 starttime = System.currentTimeMillis();
                 ContentValues[] valArr = connectionsVals.toArray(new ContentValues[0]);
                 Log.d("DataDownloadInsert", "inserting " + valArr.length + " connections");
                 int rows = nextGenDB.insertBatchContent(valArr, ConnectionsTable.TABLE_NAME);
                 endtime = System.currentTimeMillis();
                 Log.d("DataDownload", "Inserted connections found, took " + (endtime - starttime) + " ms, inserted " + rows + " rows");
             }
             nextGenDB.close();
         }
     }
 }