diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index aff6dc78d..919105e6a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,7 @@ android {
         multiDexEnabled true
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2362
+        versionCode 2364
         versionName "2.5"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
index fa048f726..7b9c6db69 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
@@ -100,7 +100,12 @@ class TaskFilterHelper {
                 query = query.`in`("tags.id", tagsId.toTypedArray())
             }
             if (searchQuery?.isNotEmpty() == true) {
-                query = query.beginsWith("text", searchQuery ?: "", Case.INSENSITIVE)
+                query = query
+                        .beginGroup()
+                        .contains("text", searchQuery ?: "", Case.INSENSITIVE)
+                        .or()
+                        .contains("notes", searchQuery ?: "", Case.INSENSITIVE)
+                        .endGroup()
             }
             if (activeFilter != null && activeFilter != Task.FILTER_ALL) {
                 when (activeFilter) {
diff --git a/build.gradle b/build.gradle
index 7e30c061f..9a98d2e41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-rc01'
+        classpath 'com.android.tools.build:gradle:4.0.0-alpha09'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath "io.realm:realm-gradle-plugin:6.0.2"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 761aae694..1ea99e237 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 15 18:23:38 CEST 2018
+#Sun Feb 02 18:26:34 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip