diff --git a/app/build.gradle b/app/build.gradle
index 1e41533e5f..63349aa47c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,6 +105,7 @@ android {
     aaptOptions {
         cruncherEnabled = false
     }
+    buildToolsVersion = '29.0.2'
     kotlinOptions {
         jvmTarget = "1.8"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d4a7e94378..3933bce40a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,6 +37,13 @@
                 <data
                     android:scheme="https"
                     android:host="@string/FRONTEND_HOST"/>
+                <data
+                    android:pathPrefix="/e"/>
+                <data
+                    android:pathPrefix="/reset-password"/>
+                <data
+                    android:pathPrefix="/email"/>
+
             </intent-filter>
         </activity>
         <provider
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt
index 4ad43c1db0..7025a72645 100644
--- a/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt
@@ -141,6 +141,7 @@ class EventService(
 
     fun addFavorite(favoriteEvent: FavoriteEvent, event: Event) =
         favoriteEventApi.addFavorite(favoriteEvent).map {
+
             event.favoriteEventId = it.id
             event.favorite = true
             eventDao.insertEvent(event)
@@ -148,7 +149,7 @@ class EventService(
         }
 
     fun removeFavorite(favoriteEvent: FavoriteEvent, event: Event): Completable =
-        favoriteEventApi.removeFavorite(favoriteEvent.id).andThen {
+        favoriteEventApi.removeFavorite(event.id).andThen {
             event.favorite = false
             event.favoriteEventId = null
             eventDao.insertEvent(event)