diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index 625ab036b..f393fdc04 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -308,7 +308,7 @@ public abstract class BaseMainActivity extends BaseActivity
         //This task will allow to instance a static PeertubeInformation class
         if (social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) {
             try {
-                new RetrievePeertubeInformationAsyncTask(getApplicationContext()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                new RetrievePeertubeInformationAsyncTask(getApplicationContext()).execute();
             } catch (Exception ignored) {
             }
         }
@@ -1272,7 +1272,7 @@ public abstract class BaseMainActivity extends BaseActivity
             int versionCode = BuildConfig.VERSION_CODE;
             if (lastReleaseNoteRead != versionCode) { //Need to push release notes
                 if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
-                    new RetrieveRemoteDataAsyncTask(getApplicationContext(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                    new RetrieveRemoteDataAsyncTask(getApplicationContext(), BaseMainActivity.this).execute();
                 }
                 try (BufferedReader reader = new BufferedReader(
                         new InputStreamReader(getAssets().open("changelogs/" + versionCode + ".txt")))) {
@@ -1313,10 +1313,10 @@ public abstract class BaseMainActivity extends BaseActivity
         if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
 
             // Retrieves instance
-            new RetrieveInstanceAsyncTask(getApplicationContext(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            new RetrieveInstanceAsyncTask(getApplicationContext(), BaseMainActivity.this).execute();
             // Retrieves filters
             if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
-                new ManageFiltersAsyncTask(getApplicationContext(), GET_ALL_FILTER, null, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                new ManageFiltersAsyncTask(getApplicationContext(), GET_ALL_FILTER, null, BaseMainActivity.this).execute();
             }
         }
 
@@ -1327,7 +1327,7 @@ public abstract class BaseMainActivity extends BaseActivity
             new TimelineCacheDAO(BaseMainActivity.this, db).removeAfterDate(dateString);
         });
         if (Helper.isLoggedIn(getApplicationContext())) {
-            new UpdateAccountInfoByIDAsyncTask(getApplicationContext(), social, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            new UpdateAccountInfoByIDAsyncTask(getApplicationContext(), social, BaseMainActivity.this).execute();
         }
         mutedAccount = new TempMuteDAO(getApplicationContext(), db).getAllTimeMuted(account);
 
@@ -1469,7 +1469,7 @@ public abstract class BaseMainActivity extends BaseActivity
                 if (!isUrl)
                     return;
                 //Here we know that the intent contains a valid URL
-                new RetrieveRemoteDataAsyncTask(BaseMainActivity.this, url, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                new RetrieveRemoteDataAsyncTask(BaseMainActivity.this, url, BaseMainActivity.this).execute();
             }
         } else if (Intent.ACTION_SEND.equals(action) && type != null) {
             if ("text/plain".equals(type)) {
@@ -1633,9 +1633,6 @@ public abstract class BaseMainActivity extends BaseActivity
         PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("isMainActivityRunning", true).apply();
 
         //Proceeds to update of the authenticated account
-        /*if (Helper.isLoggedIn(getApplicationContext())) {
-            new UpdateAccountInfoByIDAsyncTask(getApplicationContext(), social, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-        }*/
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         String datestr = sharedpreferences.getString(Helper.HOME_LAST_READ + userId + instance, null);
 
@@ -2051,7 +2048,7 @@ public abstract class BaseMainActivity extends BaseActivity
             if (accounts != null && accounts.size() > 0) {
                 developers = new ArrayList<>();
                 developers.addAll(accounts);
-                new RetrieveRelationshipAsyncTask(getApplicationContext(), accounts.get(0).getId(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                new RetrieveRelationshipAsyncTask(getApplicationContext(), accounts.get(0).getId(), BaseMainActivity.this).execute();
             }
         }
     }
diff --git a/app/src/main/java/app/fedilab/android/sqlite/SearchDAO.java b/app/src/main/java/app/fedilab/android/sqlite/SearchDAO.java
index f87057216..56ad270b2 100644
--- a/app/src/main/java/app/fedilab/android/sqlite/SearchDAO.java
+++ b/app/src/main/java/app/fedilab/android/sqlite/SearchDAO.java
@@ -162,8 +162,10 @@ public class SearchDAO {
      */
     private List<String> cursorToListSearch(Cursor c) {
         //No element found
-        if (c.getCount() == 0)
+        if (c.getCount() == 0) {
+            c.close();
             return null;
+        }
         List<String> searches = new ArrayList<>();
         while (c.moveToNext()) {
             if (c.getString(c.getColumnIndex(Sqlite.COL_NAME)) != null)
@@ -242,8 +244,10 @@ public class SearchDAO {
      */
     private List<TagTimeline> cursorToTagTimelineSearch(Cursor c) {
         //No element found
-        if (c.getCount() == 0)
+        if (c.getCount() == 0) {
+            c.close();
             return null;
+        }
         List<TagTimeline> searches = new ArrayList<>();
         while (c.moveToNext()) {
             TagTimeline tagTimeline = new TagTimeline();