diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/SortType.java b/app/src/main/java/eu/toldi/infinityforlemmy/SortType.java
index 68f432b1..85a3e97b 100644
--- a/app/src/main/java/eu/toldi/infinityforlemmy/SortType.java
+++ b/app/src/main/java/eu/toldi/infinityforlemmy/SortType.java
@@ -69,15 +69,15 @@ public class SortType {
     }
 
     public enum Time {
-        HOUR("TopHour", "Top Hour"),
-        SIX_HOURS("TopSixHour", "Top Six Hours"),
-        TWELVE_HOURS("TopTwelveHour", "Top Twelve Hours"),
+        HOUR("hour", "Hour"),
+        SIX_HOURS("SixHour", "Six Hours"),
+        TWELVE_HOURS("TwelveHour", "Twelve Hours"),
         DAY("day", "Day"),
         WEEK("week", "Week"),
         MONTH("month", "Month"),
-        THREE_MONTHS("TopThreeMonth", "Top Three Months"),
-        SIX_MONTHS("TopSixMonth", "Top Six Months"),
-        NINE_MONTHS("TopNineMonth", "Top Nine Months"),
+        THREE_MONTHS("ThreeMonths", "Three Months"),
+        SIX_MONTHS("SixMonths", "Six Months"),
+        NINE_MONTHS("NineMonths", "Nine Months"),
         YEAR("year", "Year"),
         ALL("all", "All Time");
 
@@ -88,5 +88,14 @@ public class SortType {
             this.value = value;
             this.fullName = fullName;
         }
+
+        public static Time fromValue(String value) {
+            for (Time time : values()) {
+                if (time.value.equalsIgnoreCase(value)) {
+                    return time;
+                }
+            }
+            return null;
+        }
     }
 }
diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java
index f0c581a8..e8ea6881 100644
--- a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java
+++ b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java
@@ -536,17 +536,12 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                 sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + subredditName,
                         mSharedPreferences.getString(SharedPreferencesUtils.SUBREDDIT_DEFAULT_SORT_TIME, SortType.Time.ALL.name()));
             }
+
+            sortType = newSortType(sort, sortTime);
+
             boolean displaySubredditName = subredditName != null && (subredditName.equals("local") || subredditName.equals("all"));
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_SUBREDDIT_POST_BASE + subredditName, defaultPostLayout);
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.HOT : st;
-            if (sortTime != null) {
-                st = SortType.Type.fromValue(sortTime);
-                st = st == null ? SortType.Type.TOP_ALL : st;
-                sortType = new SortType(st);
-            } else {
-                sortType = new SortType(st);
-            }
+
 
             mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit, mGfycatRetrofit,
                     mRedgifsRetrofit, mStreamableApiProvider, mCustomThemeWrapper, locale,
@@ -610,16 +605,12 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                 sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_MULTI_REDDIT_POST_BASE + multiRedditPath,
                         SortType.Time.ALL.name());
             }
+
+            sortType = newSortType(sort, sortTime);
+
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_MULTI_REDDIT_POST_BASE + multiRedditPath,
                     defaultPostLayout);
 
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.HOT : st;
-            if (sortTime != null) {
-                sortType = new SortType(st, SortType.Time.valueOf(sortTime));
-            } else {
-                sortType = new SortType(st);
-            }
 
             mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit, mGfycatRetrofit,
                     mRedgifsRetrofit, mStreamableApiProvider, mCustomThemeWrapper, locale,
@@ -677,17 +668,14 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
 
             String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_USER_POST_BASE + username,
                     mSharedPreferences.getString(SharedPreferencesUtils.USER_DEFAULT_SORT_TYPE, SortType.Type.NEW.name()));
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.NEW : st;
+            String sortTime = null;
             if (sort.equalsIgnoreCase(SortType.Type.TOP.value)) {
-                String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_USER_POST_BASE + username,
+                sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_USER_POST_BASE + username,
                         mSharedPreferences.getString(SharedPreferencesUtils.USER_DEFAULT_SORT_TIME, SortType.Time.ALL.name()));
-                st = SortType.Type.fromValue(sortTime);
-                st = st == null ? SortType.Type.NEW : st;
-                sortType = new SortType(st);
-            } else {
-                sortType = new SortType(st);
             }
+
+            sortType = newSortType(sort, sortTime);
+
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_USER_POST_BASE + username, defaultPostLayout);
 
             mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit, mGfycatRetrofit,
@@ -744,14 +732,11 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             subredditName = getArguments().getString(EXTRA_NAME);
 
             String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + "-", SortType.Type.HOT.name());
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.NEW : st;
+            String sortTime = null;
             if (sort.equals(SortType.Type.TOP.name())) {
-                String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + "-", SortType.Time.ALL.name());
-                sortType = new SortType(st, SortType.Time.valueOf(sortTime));
-            } else {
-                sortType = new SortType(st);
+                sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + "-", SortType.Time.ALL.name());
             }
+            sortType = newSortType(sort, sortTime);
 
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_FRONT_PAGE_POST, defaultPostLayout);
 
@@ -806,14 +791,11 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             nameOfUsage = multiRedditPath;
 
             String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_MULTI_REDDIT_POST_BASE + multiRedditPath, SortType.Type.HOT.name());
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.NEW : st;
+            String sortTime = null;
             if (sort.equals(SortType.Type.TOP.name())) {
-                String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_MULTI_REDDIT_POST_BASE + multiRedditPath, SortType.Time.ALL.name());
-                sortType = new SortType(st, SortType.Time.valueOf(sortTime));
-            } else {
-                sortType = new SortType(st);
+                sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_MULTI_REDDIT_POST_BASE + multiRedditPath, SortType.Time.ALL.name());
             }
+            sortType = newSortType(sort, sortTime);
 
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_MULTI_REDDIT_POST_BASE + multiRedditPath, defaultPostLayout);
 
@@ -866,14 +848,11 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             nameOfUsage = PostFilterUsage.NO_USAGE;
             subredditName = getArguments().getString(EXTRA_NAME);
             String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_BEST_POST, SortType.Type.ACTIVE.name());
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.NEW : st;
+            String sortTime = null;
             if (sort.equals(SortType.Type.TOP.name())) {
-                String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_BEST_POST, SortType.Time.ALL.name());
-                sortType = new SortType(st, SortType.Time.valueOf(sortTime));
-            } else {
-                sortType = new SortType(st);
+                sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_BEST_POST, SortType.Time.ALL.name());
             }
+            sortType = newSortType(sort, sortTime);
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_FRONT_PAGE_POST, defaultPostLayout);
 
             mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit, mGfycatRetrofit,
@@ -1389,25 +1368,25 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SAVE_SORT_TYPE, true)) {
                 switch (postType) {
                     case PostPagingSource.TYPE_FRONT_PAGE:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_BEST_POST, sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_BEST_POST, sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_BEST_POST, sortType.getTime().name()).apply();
                         }
                         break;
                     case PostPagingSource.TYPE_SUBREDDIT:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + subredditName, sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + subredditName, sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + subredditName, sortType.getTime().name()).apply();
                         }
                         break;
                     case PostPagingSource.TYPE_USER:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_USER_POST_BASE + username, sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_USER_POST_BASE + username, sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_USER_POST_BASE + username, sortType.getTime().name()).apply();
                         }
                         break;
                     case PostPagingSource.TYPE_SEARCH:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SEARCH_POST, sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SEARCH_POST, sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_SEARCH_POST, sortType.getTime().name()).apply();
                         }else {
@@ -1417,14 +1396,14 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                     case PostPagingSource.TYPE_MULTI_REDDIT:
                     case PostPagingSource.TYPE_ANONYMOUS_MULTIREDDIT:
                         mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_MULTI_REDDIT_POST_BASE + multiRedditPath,
-                                sortType.getType().name()).apply();
+                                sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_MULTI_REDDIT_POST_BASE + multiRedditPath,
                                     sortType.getTime().name()).apply();
                         }
                         break;
                     case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + "-", sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + "-", sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + "-", sortType.getTime().name()).apply();
                         }
@@ -2263,6 +2242,24 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
         return false;
     }
 
+    public SortType newSortType(String sortTypeText, String sortTimeText) {
+        SortType.Type st = SortType.Type.fromValue(sortTypeText);
+        st = st == null ? SortType.Type.NEW : st;
+        SortType result;
+        if (sortTypeText.startsWith("Top")) {
+            sortTimeText = st.value.substring(3);
+            result = new SortType(st, SortType.Time.fromValue(sortTimeText));
+        } else if (sortTimeText != null) {
+            SortType.Time sortTime = SortType.Time.fromValue(sortTimeText);
+            SortType.Type sortType = SortType.Type.fromValue("Top" + sortTimeText);
+            result = new SortType(sortType != null ? sortType : st, sortTime);
+        } else {
+            result = new SortType(st);
+        }
+
+        return result;
+    }
+
     private static abstract class LazyModeRunnable implements Runnable {
         private int currentPosition = -1;
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 2957fdeb..84105410 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -543,17 +543,17 @@
     </string-array>
 
     <string-array name="settings_default_sort_time_values">
-        <item>TopHour</item>
-        <item>TopSixHour</item>
-        <item>TopTwelveHour</item>
-        <item>TopDay</item>
-        <item>TopWeek</item>
-        <item>TopMonth</item>
-        <item>TopThreeMonths</item>
-        <item>TopSixMonths</item>
-        <item>TopNineMonths</item>
-        <item>TopYear</item>
-        <item>TopAll</item>
+        <item>hour</item>
+        <item>SixHour</item>
+        <item>TwelveHour</item>
+        <item>day</item>
+        <item>week</item>
+        <item>month</item>
+        <item>ThreeMonths</item>
+        <item>SixMonths</item>
+        <item>NineMonths</item>
+        <item>year</item>
+        <item>all</item>
     </string-array>
 
     <string-array name="settings_default_search_result_tab">