diff --git a/app/inc/Rules.php b/app/inc/Rules.php
index 75a2785..4ec95bb 100644
--- a/app/inc/Rules.php
+++ b/app/inc/Rules.php
@@ -55,7 +55,7 @@ class Rules {
             'clearStorage' => true
         ],
         'estadao.com.br' => [
-            'idElementRemove' => ['paywall', 'paywall-container'],
+            'idElementRemove' => ['paywall', 'paywall-container', 'softwall'],
             'classElementRemove' => ['paywall-content', 'signin-wall', 'pay-wall'],
             'scriptTagRemove' => ['paywall.js', 'pywll.js'],
             'cookies' => [
@@ -232,7 +232,8 @@ class Rules {
                 'tinypass.js',
                 'tinypass.min.js',
                 'tp.min.js',
-                'premium.js'
+                'premium.js',
+                'amp-access-0.1.js'
             ],
             'cookies' => [
                 'cookie',
diff --git a/app/inc/URLAnalyzer.php b/app/inc/URLAnalyzer.php
index 309ac3e..040c4de 100644
--- a/app/inc/URLAnalyzer.php
+++ b/app/inc/URLAnalyzer.php
@@ -240,6 +240,11 @@ class URLAnalyzer {
         $url = strtolower($url);
         $url = trim($url);
         
+        // Detecta e converte URLs AMP
+        if (preg_match('#https://([^.]+)\.cdn\.ampproject\.org/v/s/([^/]+)(.*)#', $url, $matches)) {
+            $url = 'https://' . $matches[2] . $matches[3];
+        }
+        
         $parsedUrl = parse_url($url);
         
         if (!isset($parsedUrl['scheme'])) {
@@ -309,29 +314,47 @@ class URLAnalyzer {
      */
     private function isTrackingParam($param) {
         $trackingPatterns = [
-            '/^utm_/',      // Google Analytics
-            '/^fbclid$/',   // Facebook
-            '/^gclid$/',    // Google Ads
-            '/^msclkid$/',  // Microsoft
-            '/^mc_/',       // Mailchimp
-            '/^pk_/',       // Piwik/Matomo
-            '/^n_/',        // Navegg
-            '/^dclid$/',    // DoubleClick
-            '/^_hs/',       // HubSpot
+            // Google Analytics e AMP
+            '/^utm_/',      // Universal Analytics
             '/^_ga/',       // Google Analytics
             '/^_gl/',       // Google Analytics linker
+            '/^gclid$/',    // Google Ads Click ID
+            '/^dclid$/',    // DoubleClick Click ID
+            '/^amp_/',      // AMP parameters
+            '/^usqp$/',     // Google AMP Cache
+            '/^__amp_source_origin$/', // AMP source origin
+            '/^amp_latest_update_time$/', // AMP update time
+            '/^amp_cb$/',   // AMP callback
+            '/^amp_gsa$/',  // AMP Google Search App
+            '/^amp_js_v$/', // AMP JavaScript version
+            '/^amp_r$/',    // AMP referrer
+            '/^aoh$/',      // AMP origin header
+            
+            // Social Media
+            '/^fbclid$/',   // Facebook Click ID
+            '/^msclkid$/',  // Microsoft Click ID
+            '/^igshid$/',   // Instagram
+            '/^yclid$/',    // Yandex Click ID
+            
+            // Email Marketing
+            '/^mc_/',       // Mailchimp
+            '/^_hs/',       // HubSpot
+            '/^_hsenc$/',   // HubSpot encoded
+            '/^_hsmi$/',    // HubSpot message ID
+            '/^mkt_tok$/',  // Marketo
+            
+            // Analytics e Tracking
+            '/^pk_/',       // Piwik/Matomo
+            '/^n_/',        // Navegg
+            '/^_openstat$/', // OpenStat
+            
+            // Outros
             '/^ref$/',      // Referrer
             '/^source$/',   // Source tracking
             '/^medium$/',   // Medium tracking
             '/^campaign$/', // Campaign tracking
             '/^affiliate$/', // Affiliate tracking
             '/^partner$/',  // Partner tracking
-            '/^_openstat$/', // OpenStat
-            '/^yclid$/',    // Yandex
-            '/^_hsenc$/',   // HubSpot
-            '/^_hsmi$/',    // HubSpot
-            '/^mkt_tok$/',  // Marketo
-            '/^igshid$/',   // Instagram
         ];
         
         foreach ($trackingPatterns as $pattern) {