diff --git a/FAQ.md b/FAQ.md
index 1a5407d9..946daca8 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -36,3 +36,10 @@ Reinstalling the app should fix this issue.
 
 ##### Q: Why has all the text gone white/dissapeared? 
 Change the theme to Black or Dark and change it back to what you had before.
+
+##### Q: Why some of my songs are not showing in my library?
+Try checking up if those songs are not less than 30 seconds, if so head to settings -> other -> filter song duration. Put this to zero and see the songs should start appearimg in the library.
+If this doesn't work out for you, re-scanning the media folder should help and subsquently rebooting the device to refresh media store.
+
+##### Q: Why my playlist/playlist songs keep disappearing?
+Playlist/Playlist songs disappearing is based on android media store system. Save those playlist as file(Tap on three dot menu next to available playlist and save as file) and it should get fixed.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5b8b416b..49da26a4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="com.android.vending.BILLING" />
 
@@ -24,7 +25,8 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.RetroMusic.Light"
         android:usesCleartextTraffic="false"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning"
+        tools:targetApi="m">
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/app_name"
@@ -76,7 +78,7 @@
                 <data android:mimeType="application/x-ogg" />
                 <data android:mimeType="application/itunes" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -234,7 +236,8 @@
             android:name=".service.MusicService"
             android:enabled="true"
             android:exported="true"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.media.browse.MediaBrowserService" />
             </intent-filter>
diff --git a/build.gradle b/build.gradle
index 373fd761..e4eb1d0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.android.tools.build:bundletool:0.9.0'
     }