diff --git a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
index e5c03d64..afe956cc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
@@ -49,10 +49,14 @@ inline fun debugWarning(assert: () -> Boolean, message: () -> String) {
     }
 }
 
-fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
+fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t:  T) -> Unit) {
     liveData.observe(this) { it?.let { t -> action(t) } }
 }
 
+fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) -> Unit) {
+    liveData.observe(this) { action(it) }
+}
+
 inline fun <reified T : Any> some(value: T?): Some<T> {
     return if (value == null) {
         Some.None
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 37f13c6c..bf39edc7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -28,19 +28,13 @@ import com.hippo.unifile.UniFile
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.mvvm.Resource
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
-import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.*
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subtitleProviders
 import com.lagradost.cloudstream3.ui.player.CS3IPlayer.Companion.preferredAudioTrackLanguage
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.updateForcedEncoding
 import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSubtitleMimeType
-import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import com.lagradost.cloudstream3.ui.result.ResultFragment
-import com.lagradost.cloudstream3.ui.result.SyncViewModel
-import com.lagradost.cloudstream3.ui.result.setText
+import com.lagradost.cloudstream3.ui.result.*
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageISO639_1
 import com.lagradost.cloudstream3.utils.*
@@ -63,6 +57,9 @@ import kotlinx.android.synthetic.main.player_select_source_and_subs.*
 import kotlinx.android.synthetic.main.player_select_source_and_subs.subtitles_click_settings
 import kotlinx.android.synthetic.main.player_select_tracks.*
 import kotlinx.coroutines.Job
+import java.util.*
+import kotlin.collections.ArrayList
+import kotlin.collections.HashMap
 
 class GeneratorPlayer : FullScreenPlayer() {
     companion object {
@@ -332,28 +329,54 @@ class GeneratorPlayer : FullScreenPlayer() {
         dialog.search_loading_bar.progressTintList = color
         dialog.search_loading_bar.indeterminateTintList = color
 
-        //Automatically search after entering Year
-        dialog.subtitles_search_year.setOnEditorActionListener(OnEditorActionListener { v, actionId, event ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
-                return@OnEditorActionListener true
+        observeNullable(viewModel.currentSubtitleYear) {
+            // When year is changed search again
+            dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
+            dialog.year_btt.text = it?.toString() ?: txt(R.string.none).asString(context)
+        }
+
+        dialog.year_btt?.setOnClickListener {
+            val none = txt(R.string.none).asString(context)
+            val currentYear = Calendar.getInstance().get(Calendar.YEAR)
+            val earliestYear = 1900
+
+            val years = (currentYear downTo earliestYear).toList()
+            val options = listOf(none) + years.map {
+                it.toString()
             }
-            false
-        })
+
+            val selectedIndex = viewModel.currentSubtitleYear.value
+                ?.let {
+                    // + 1 since none also takes a space
+                    years.indexOf(it) + 1
+                }
+                ?.takeIf { it >= 0 } ?: 0
+
+            activity?.showDialog(
+                options,
+                selectedIndex,
+                txt(R.string.year).asString(context),
+                true, {
+                }, { index ->
+                    viewModel.setSubtitleYear(years.getOrNull(index - 1))
+                }
+            )
+        }
 
         dialog.subtitles_search.setOnQueryTextListener(object :
             androidx.appcompat.widget.SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
                 dialog.search_loading_bar?.show()
                 ioSafe {
-                    val year = dialog.subtitles_search_year?.text?.toString()?.toIntOrNull()
                     val search =
-                        AbstractSubtitleEntities.SubtitleSearch(query = query ?: return@ioSafe,
+                        AbstractSubtitleEntities.SubtitleSearch(
+                            query = query ?: return@ioSafe,
                             imdb = imdbId,
                             epNumber = currentTempMeta.episode,
                             seasonNumber = currentTempMeta.season,
                             lang = currentLanguageTwoLetters.ifBlank { null },
-                            year = year)
+                            year = viewModel.currentSubtitleYear.value
+                        )
                     val results = providers.amap {
                         try {
                             it.search(search)
@@ -361,7 +384,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                             null
                         }
                     }.filterNotNull()
-                    val max = results.map { it.size }.maxOrNull() ?: return@ioSafe
+                    val max = results.maxOfOrNull { it.size } ?: return@ioSafe
 
                     // very ugly
                     val items = ArrayList<AbstractSubtitleEntities.SubtitleEntity>()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index dc33f67c..7faf0cf5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -35,6 +35,13 @@ class PlayerGeneratorViewModel : ViewModel() {
     private val _currentStamps = MutableLiveData<List<EpisodeSkip.SkipStamp>>(emptyList())
     val currentStamps: LiveData<List<EpisodeSkip.SkipStamp>> = _currentStamps
 
+    private val _currentSubtitleYear = MutableLiveData<Int?>(null)
+    val currentSubtitleYear: LiveData<Int?> = _currentSubtitleYear
+
+    fun setSubtitleYear(year: Int?) {
+        _currentSubtitleYear.postValue(year)
+    }
+
     fun getId(): Int? {
         return generator?.getCurrentId()
     }
diff --git a/app/src/main/res/layout/dialog_online_subtitles.xml b/app/src/main/res/layout/dialog_online_subtitles.xml
index 4acd27be..7803e261 100644
--- a/app/src/main/res/layout/dialog_online_subtitles.xml
+++ b/app/src/main/res/layout/dialog_online_subtitles.xml
@@ -1,159 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@null"
-        android:orientation="vertical">
+    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"
+    android:background="@null"
+    android:orientation="vertical">
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="60dp"
-            android:baselineAligned="false"
-            android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="60dp"
+        android:baselineAligned="false"
+        android:orientation="horizontal">
 
         <LinearLayout
-                android:id="@+id/sort_subtitles_holder"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="50"
-                android:orientation="vertical">
+            android:id="@+id/sort_subtitles_holder"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="50"
+            android:orientation="vertical">
 
             <!--   android:id="@+id/subs_settings"                 android:foreground="?android:attr/selectableItemBackgroundBorderless"
 -->
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    tools:ignore="UseCompoundDrawables">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
 
                 <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="40dp"
-                        android:layout_margin="10dp"
-                        android:background="@drawable/search_background"
-                        android:visibility="visible">
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_margin="10dp"
+                    android:background="@drawable/search_background"
+                    android:visibility="visible">
 
                     <FrameLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="30dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="30dp">
+                        android:layout_width="match_parent"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginEnd="30dp">
 
                         <androidx.appcompat.widget.SearchView
-                                android:id="@+id/subtitles_search"
-                                app:iconifiedByDefault="false"
-                                app:queryBackground="@color/transparent"
-                                app:queryHint="@string/search_hint"
+                            android:id="@+id/subtitles_search"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_vertical"
 
-                                app:searchIcon="@drawable/search_icon"
-                                android:layout_width="match_parent"
+                            android:imeOptions="actionSearch"
+                            android:inputType="text"
 
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center_vertical"
+                            android:paddingStart="-10dp"
+                            app:iconifiedByDefault="false"
 
-                                android:imeOptions="actionSearch"
-                                android:inputType="text"
-                                android:paddingStart="-10dp"
-                                tools:ignore="RtlSymmetry">
+                            app:queryBackground="@color/transparent"
+                            app:queryHint="@string/search_hint"
+                            app:searchIcon="@drawable/search_icon"
+                            tools:ignore="RtlSymmetry">
 
-                            <androidx.core.widget.ContentLoadingProgressBar
-                                    android:id="@+id/search_loading_bar"
-                                    style="@style/Widget.AppCompat.ProgressBar"
-                                    android:layout_width="20dp"
-                                    android:layout_height="20dp"
-                                    android:layout_gravity="center"
-                                    android:layout_marginStart="-70dp"
-                                    android:foregroundTint="@color/white"
-                                    android:visibility="visible"
-                                    tools:visibility="visible"
-                                    android:progressTint="@color/white">
-
-                            </androidx.core.widget.ContentLoadingProgressBar>
                             <!--app:queryHint="@string/search_hint"
                              android:background="@color/grayBackground" @color/itemBackground
                                         app:searchHintIcon="@drawable/search_white"
                                         -->
                         </androidx.appcompat.widget.SearchView>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="end"
+                            android:gravity="end">
+
+                            <androidx.core.widget.ContentLoadingProgressBar
+                                android:id="@+id/search_loading_bar"
+                                style="@style/Widget.AppCompat.ProgressBar"
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:layout_gravity="center"
+                                android:layout_marginEnd="10dp"
+                                android:foregroundTint="@color/white"
+                                android:progressTint="@color/white"
+                                android:visibility="visible"
+                                tools:visibility="visible">
+
+                            </androidx.core.widget.ContentLoadingProgressBar>
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/year_btt"
+                                style="@style/WhiteButton"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center_vertical|end"
+                                android:layout_marginEnd="20dp"
+                                android:text="@string/none"
+                                />
+                        </LinearLayout>
                     </FrameLayout>
 
                     <ImageView
-                            android:id="@+id/search_filter"
-                            app:tint="?attr/textColor"
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
+                        android:id="@+id/search_filter"
+                        android:layout_width="25dp"
+                        android:layout_height="25dp"
+                        android:layout_gravity="end|center_vertical"
 
-                            android:layout_gravity="end|center_vertical"
-                            android:layout_margin="10dp"
-                            android:background="?selectableItemBackgroundBorderless"
-                            android:contentDescription="@string/change_providers_img_des"
-                            android:nextFocusLeft="@id/main_search"
-                            android:nextFocusRight="@id/main_search"
-                            android:nextFocusUp="@id/nav_rail_view"
-                            android:nextFocusDown="@id/search_autofit_results"
-                            android:src="@drawable/ic_baseline_tune_24" />
+                        android:layout_margin="10dp"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:contentDescription="@string/change_providers_img_des"
+                        android:nextFocusLeft="@id/main_search"
+                        android:nextFocusRight="@id/main_search"
+                        android:nextFocusUp="@id/nav_rail_view"
+                        android:nextFocusDown="@id/search_autofit_results"
+                        android:src="@drawable/ic_baseline_tune_24"
+                        app:tint="?attr/textColor" />
                 </FrameLayout>
 
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/LinearLayout02"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_margin="10dp">
-                <EditText
-                    android:id="@+id/subtitles_search_year"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:textSize="18sp"
-                    android:hint="@string/year"
-                    android:gravity="start|center_vertical"
-                    android:textAlignment="gravity"
-                    android:maxLines="1"
-                    android:inputType="numberSigned"
-                    android:imeOptions="actionDone"/>
-            </LinearLayout>
-
             <ListView
-                    android:id="@+id/subtitle_adapter"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                android:id="@+id/subtitle_adapter"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
 
-                    android:layout_rowWeight="1"
-                    android:background="?attr/primaryBlackBackground"
-                    android:nextFocusLeft="@id/sort_providers"
-                    android:nextFocusRight="@id/cancel_btt"
-                    android:requiresFadingEdge="vertical"
-                    tools:listfooter="@layout/sort_bottom_footer_add_choice"
-                    tools:listitem="@layout/sort_bottom_single_choice" />
+                android:layout_rowWeight="1"
+                android:background="?attr/primaryBlackBackground"
+                android:nextFocusLeft="@id/sort_providers"
+                android:nextFocusRight="@id/cancel_btt"
+                android:requiresFadingEdge="vertical"
+                tools:listfooter="@layout/sort_bottom_footer_add_choice"
+                tools:listitem="@layout/sort_bottom_single_choice" />
         </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
-            android:id="@+id/apply_btt_holder"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_gravity="bottom"
-            android:layout_marginTop="-60dp"
-            android:gravity="bottom|end"
-            android:orientation="horizontal">
+        android:id="@+id/apply_btt_holder"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_gravity="bottom"
+        android:layout_marginTop="-60dp"
+        android:gravity="bottom|end"
+        android:orientation="horizontal">
 
         <com.google.android.material.button.MaterialButton
-                android:id="@+id/apply_btt"
-                style="@style/WhiteButton"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_apply" />
+            android:id="@+id/apply_btt"
+            style="@style/WhiteButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_apply" />
 
         <com.google.android.material.button.MaterialButton
-                android:id="@+id/cancel_btt"
-                style="@style/BlackButton"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_cancel" />
+            android:id="@+id/cancel_btt"
+            style="@style/BlackButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_cancel" />
     </LinearLayout>
 </LinearLayout>
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755