diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4ae53df..1498c74 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -19,6 +19,7 @@
             android:name="com.example.travelguide.ArticleInfoListActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/android/src/com/example/travelguide/ArticleInfoDetailFragment.java b/android/src/com/example/travelguide/ArticleInfoDetailFragment.java
index 9d79a60..17bc8d3 100644
--- a/android/src/com/example/travelguide/ArticleInfoDetailFragment.java
+++ b/android/src/com/example/travelguide/ArticleInfoDetailFragment.java
@@ -159,7 +159,7 @@ public class ArticleInfoDetailFragment extends Fragment implements OnClickListen
       else
       {
         final Intent i = new Intent(getActivity(), ArticleInfoListActivity.class);
-        startActivity(i);
+        startActivity(i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
       }
     }
   }
diff --git a/android/src/com/example/travelguide/ArticleInfoListFragment.java b/android/src/com/example/travelguide/ArticleInfoListFragment.java
index bc7b76a..e0198bd 100644
--- a/android/src/com/example/travelguide/ArticleInfoListFragment.java
+++ b/android/src/com/example/travelguide/ArticleInfoListFragment.java
@@ -115,16 +115,9 @@ public class ArticleInfoListFragment extends ListFragment implements LoaderCallb
 
     mLocationManager = (LocationManager) getActivity().getSystemService(Context.LOCATION_SERVICE);
 
-    // Load initial data
-    final Bundle args = new Bundle(1);
-    args.putString(KEY_QUERY, "");
-    getLoaderManager().initLoader(SEARCH_LOADER, args, this).forceLoad();
-
     // Restore the previously serialized activated item position.
     if (savedInstanceState != null && savedInstanceState.containsKey(STATE_ACTIVATED_POSITION))
-    {
       setActivatedPosition(savedInstanceState.getInt(STATE_ACTIVATED_POSITION));
-    }
   }
 
   @Override
@@ -132,8 +125,9 @@ public class ArticleInfoListFragment extends ListFragment implements LoaderCallb
   {
     super.onResume();
 
-    checkLocation();
     Utils.hideKeyboard(getActivity());
+    checkLocation();
+    search(mSearchText.getText().toString());
   }
 
   private void checkLocation()
@@ -163,9 +157,7 @@ public class ArticleInfoListFragment extends ListFragment implements LoaderCallb
 
     // Activities containing this fragment must implement its callbacks.
     if (!(activity instanceof Callbacks))
-    {
       throw new IllegalStateException("Activity must implement fragment's callbacks.");
-    }
 
     mCallbacks = (Callbacks) activity;
   }
@@ -174,11 +166,11 @@ public class ArticleInfoListFragment extends ListFragment implements LoaderCallb
   public void onDetach()
   {
     super.onDetach();
-
     // Reset the active callbacks interface to the dummy implementation.
-    mCallbacks = sDummyCallbacks;
 
-    getLoaderManager().destroyLoader(SEARCH_LOADER);
+    mCallbacks = sDummyCallbacks;
+    if (getLoaderManager().hasRunningLoaders())
+      getLoaderManager().destroyLoader(SEARCH_LOADER);
   }
 
   @Override