diff --git a/Pixiview.Android/Properties/AndroidManifest.xml b/Pixiview.Android/Properties/AndroidManifest.xml
index 35ba62d..6e743fa 100644
--- a/Pixiview.Android/Properties/AndroidManifest.xml
+++ b/Pixiview.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.523" package="org.tsanie.pixiview" android:versionCode="12">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.524" package="org.tsanie.pixiview" android:versionCode="13">
 	<uses-sdk android:minSdkVersion="25" android:targetSdkVersion="28" />
 	<application android:label="Pixiview" android:icon="@mipmap/icon" android:roundIcon="@mipmap/icon_round"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/Pixiview.iOS.OpenExtension/Info.plist b/Pixiview.iOS.OpenExtension/Info.plist
index 8932c22..75cf818 100644
--- a/Pixiview.iOS.OpenExtension/Info.plist
+++ b/Pixiview.iOS.OpenExtension/Info.plist
@@ -29,8 +29,8 @@
 		<string>com.apple.share-services</string>
 	</dict>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.523</string>
+	<string>1.0.524</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 </dict>
 </plist>
diff --git a/Pixiview.iOS/Info.plist b/Pixiview.iOS/Info.plist
index a87bdf5..424ad73 100644
--- a/Pixiview.iOS/Info.plist
+++ b/Pixiview.iOS/Info.plist
@@ -79,8 +79,8 @@
 		</dict>
 	</array>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.523</string>
+	<string>1.0.524</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 </dict>
 </plist>
diff --git a/Pixiview/Illust/FavoritesPage.xaml b/Pixiview/Illust/FavoritesPage.xaml
index 13240e2..2a21935 100644
--- a/Pixiview/Illust/FavoritesPage.xaml
+++ b/Pixiview/Illust/FavoritesPage.xaml
@@ -70,6 +70,7 @@
                                     TintColor="{DynamicResource CardBackgroundColor}">
                     <u:SegmentedControl.Children>
                         <u:SegmentedControlOption Text="{r:Text All}"/>
+                        <u:SegmentedControlOption Text="{r:Text General}"/>
                         <u:SegmentedControlOption Text="{r:Text Animation}"/>
                         <u:SegmentedControlOption Text="{r:Text Online}"/>
                     </u:SegmentedControl.Children>
diff --git a/Pixiview/Illust/FavoritesPage.xaml.cs b/Pixiview/Illust/FavoritesPage.xaml.cs
index 05deede..f4329b0 100644
--- a/Pixiview/Illust/FavoritesPage.xaml.cs
+++ b/Pixiview/Illust/FavoritesPage.xaml.cs
@@ -42,6 +42,7 @@ namespace Pixiview.Illust
             gridFilter.TranslationY = -60;
             panelFilter.TranslationY = -60;
 
+            SegmentType = Preferences.Get(Configs.FavoriteTypeKey, 0);
             startIndex = -1;
             nextIndex = 0;
         }
@@ -68,6 +69,14 @@ namespace Pixiview.Illust
             }
         }
 
+        protected override void OnDisappearing()
+        {
+            base.OnDisappearing();
+
+            // saving state
+            Preferences.Set(Configs.FavoriteTypeKey, SegmentType);
+        }
+
         public override void OnUnload()
         {
             if (task != null)
@@ -103,10 +112,13 @@ namespace Pixiview.Illust
             }
             switch (SegmentType)
             {
-                case 1: // animation
+                case 1: // general (non r-18)
+                    favs = favs.Where(f => !f.IsRestrict);
+                    break;
+                case 2: // animation
                     favs = favs.Where(f => f.IllustType == IllustType.Anime);
                     break;
-                case 2: // online
+                case 3: // online
                     favs = favs.Where(f => f.BookmarkId != null);
                     break;
             }
diff --git a/Pixiview/Utils/Stores.cs b/Pixiview/Utils/Stores.cs
index 3e03f23..426c2a7 100644
--- a/Pixiview/Utils/Stores.cs
+++ b/Pixiview/Utils/Stores.cs
@@ -718,6 +718,7 @@ namespace Pixiview.Utils
         public const string QueryModeKey = "query_mode";
         public const string QueryTypeKey = "query_type";
         public const string QueryDateKey = "query_date";
+        public const string FavoriteTypeKey = "favorite_type";
 
         public const int MaxPageThreads = 3;
         public const int MaxThreads = 4;