diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f872505..c02723a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,6 +76,13 @@
         <service
             android:name=".services.CosomosBackgroundService"
             android:exported="false"></service>
+
+        <receiver android:name=".services.NotificationDone"  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.INPUT_METHOD_CHANGED" />
+            </intent-filter>
+        </receiver>
     </application>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/app/src/main/java/com/example/cosmosclient/entities/RequestList.java b/app/src/main/java/com/example/cosmosclient/entities/RequestList.java
index 1d84110..8ae645b 100644
--- a/app/src/main/java/com/example/cosmosclient/entities/RequestList.java
+++ b/app/src/main/java/com/example/cosmosclient/entities/RequestList.java
@@ -33,7 +33,7 @@
     }
 
     public Request getRequestById(String rId){
-        for(Request request : this.getRequests()){
+        for(Request request : getRequests()){
             if(request.getrId().equals(rId)){
                 return request;
             }
diff --git a/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java b/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java
index 8191313..af55e7c 100644
--- a/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java
+++ b/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java
@@ -31,7 +31,7 @@
     public void onReceive(Context context, Intent intent) {
         Cosmos app = (Cosmos) context.getApplicationContext();
         String gId = intent.getExtras().getString("gId");
-        Request editRequest = app.getGroup(gId).getRequestList().getRequestById(intent.getExtras().getString("gId"));
+        Request editRequest = app.getGroup(gId).getRequestList().getRequestById(intent.getExtras().getString("rId"));
         if(gId == null){
             System.out.println("error");
             return;