diff --git a/gradle/apiGenerator.gradle b/gradle/apiGenerator.gradle
index 90d1ae8..63d2bf8 100644
--- a/gradle/apiGenerator.gradle
+++ b/gradle/apiGenerator.gradle
@@ -7,7 +7,7 @@ configurations {
 }
 
 dependencies {
-    apigenerator 'ru.touchin:api-generator:1.1.26'
+    apigenerator 'ru.touchin:api-generator:1.1.33'
 }
 
 android.applicationVariants.all { variant ->
@@ -24,7 +24,7 @@ android.applicationVariants.all { variant ->
         jarArgs.add("--output-path")
         jarArgs.add("${generatedModelsDirectory.path}")
         jarArgs.add("--package-name")
-        jarArgs.add("${applicationId}")
+        jarArgs.add("${rootProject.extensions.findByName("applicationId") ?: applicationId}")
         javaexec { main = "-jar"; args = jarArgs; workingDir = file("${rootDir}") }
     }
 
diff --git a/lint/lint.xml b/lint/lint.xml
index 063efda..80f8723 100644
--- a/lint/lint.xml
+++ b/lint/lint.xml
@@ -132,7 +132,6 @@
     <issue id="AllowBackup" severity="error"/>
     <issue id="AlwaysShowAction" severity="error"/>
     <issue id="AppCompatMethod" severity="error"/>
-    <issue id="AppIndexingApiWarning" severity="error"/>
     <issue id="Assert" severity="error"/>
     <issue id="CommitPrefEdits" severity="error"/>
     <issue id="CommitTransaction" severity="error"/>
@@ -221,7 +220,6 @@
 
     <!-- DISABLE RULES BELOW -->
     <issue id="GoogleAppIndexingApiWarning" severity="ignore"/>
-    <issue id="GoogleAppIndexingUrlError" severity="ignore"/>
     <issue id="GoogleAppIndexingWarning" severity="ignore"/>
     <issue id="AppLinksAutoVerifyError" severity="ignore"/>
     <issue id="AppLinksAutoVerifyWarning" severity="ignore"/>