Add new rules and rewrite old rules

+ New rules for:
+ youtube
+ facebook
+ imdb
+ adsensecustomsearchads
+ new global rules

Rewrite old rules regex after the = from "[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?"
to "[^&]*(\\?|&(amp;)?)?", because it is stronger.

data/data.json

@@ -4,17 +4,16 @@
             "urlPattern": "(https:\\/\\/||http:\\/\\/).*(\\.amazon\\.)\\w{2,}\\/.*",
             "completeProvider": false,
             "rules": [
-                "pf_rd_[a-zA-Z]=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "pf_rd_[a-zA-Z]=[^&]*(\\?|&(amp;)?)?",
-                "qid=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "qid=[^&]*(\\?|&(amp;)?)?",
-                "sr=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "sr=[^&]*(\\?|&(amp;)?)?",
-                "srs=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "srs=[^&]*(\\?|&(amp;)?)?",
-                ".*(amazon-adsystem\\.com)\\/.*",
                 ".*(adsensecustomsearchads\\.com)\\/.*",
-                "pd_rd_[a-zA-Z]*=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "pd_rd_[a-zA-Z]*=[^&]*(\\?|&(amp;)?)?",
-                "__mk_[a-zA-Z]{1,3}_[a-zA-Z]{1,3}=[a-zA-Z0-9\\-\\.\\_\\%]*[\\?|&]?",
+                "__mk_[a-zA-Z]{1,3}_[a-zA-Z]{1,3}=[^&]*(\\?|&(amp;)?)?",
-                "url=[a-zA-Z0-9\\-\\.\\_\\%]*[\\?|&]?",
+                "url=[^&]*(\\?|&(amp;)?)?",
-                "spIA=[a-zA-Z0-9\\-\\.\\_\\%]*[\\?|&]?",
+                "spIA=[^&]*(\\?|&(amp;)?)?",
-                "rh=[a-zA-Z0-9\\-\\.\\_\\%]*[\\?|&]?"
+                "rh=[^&]*(\\?|&(amp;)?)?"
             ],
             "exceptions": [
                 ".*(amazon\\.)\\w{2,}(\/gp\/).*\\/redirector.html\\/.*"
@@ -24,27 +23,27 @@
             "urlPattern": "(https:\\/\\/||http:\\/\\/).*(\\.google\\.)\\w{2,}\\/.*",
             "completeProvider": false,
             "rules": [
-                "ved=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "ved=[^&]*(\\?|&(amp;)?)?",
-                "bi[a-zA-Z]*=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "bi[a-zA-Z]*=[^&]*(\\?|&(amp;)?)?",
-                "gfe_[a-zA-Z]*=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "gfe_[a-zA-Z]*=[^&]*(\\?|&(amp;)?)?",
-                "ei=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "ei=[^&]*(\\?|&(amp;)?)?",
-                "source=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "source=[^&]*(\\?|&(amp;)?)?",
-                "gs_[a-zA-Z]*=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "gs_[a-zA-Z]*=[^&]*(\\?|&(amp;)?)?",
-                "site=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "site=[^&]*(\\?|&(amp;)?)?",
-                "&\\.[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "&\\.[^&]*(\\?|&(amp;)?)?",
-                "oq=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "oq=[^&]*(\\?|&(amp;)?)?",
-                "esrc=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "esrc=[^&]*(\\?|&(amp;)?)?",
-                "uact=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "uact=[^&]*(\\?|&(amp;)?)?",
-                "cd=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "cd=[^&]*(\\?|&(amp;)?)?",
-                "cad=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "cad=[^&]*(\\?|&(amp;)?)?",
-                "gws_[a-zA-Z]*=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "gws_[a-zA-Z]*=[^&]*(\\?|&(amp;)?)?",
-                "im[a-zA-Z]*=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "im[a-zA-Z]*=[^&]*(\\?|&(amp;)?)?",
-                "atyp=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "atyp=[^&]*(\\?|&(amp;)?)?",
-                "vet=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "vet=[^&]*(\\?|&(amp;)?)?",
-                "zx=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "zx=[^&]*(\\?|&(amp;)?)?",
-                "_u=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "_u=[^&]*(\\?|&(amp;)?)?",
-                "je=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?",
+                "je=[^&]*(\\?|&(amp;)?)?",
-                "[a-zA-Z\\_]+id=[a-zA-Z0-9\\-\\.\\_]*[\\?|&]?"
+                "[a-zA-Z\\_]+id=[^&]*(\\?|&(amp;)?)?"
             ],
             "exceptions": []
         },
@@ -60,11 +59,26 @@
             "rules": [],
             "exceptions": []
         },
-        "utm": {
+        "globalRules": {
             "urlPattern": ".*",
             "completeProvider": false,
             "rules": [
-                "utm_[a-zA-Z]*=.*[\\?|&]?"
+                "utm_[a-zA-Z]*=[^&]*(\\?|&(amp;)?)?",
+                "ga_source=[^&]*(\\?|&(amp;)?)?",
+                "ga_medium=[^&]*(\\?|&(amp;)?)?",
+                "ga_term=[^&]*(\\?|&(amp;)?)?",
+                "ga_content=[^&]*(\\?|&(amp;)?)?",
+                "ga_campaign=[^&]*(\\?|&(amp;)?)?",
+                "ga_place=[^&]*(\\?|&(amp;)?)?",
+                "yclid=[^&]*(\\?|&(amp;)?)?",
+                "_openstat=[^&]*(\\?|&(amp;)?)?",
+                "fb_action_ids=[^&]*(\\?|&(amp;)?)?",
+                "fb_action_types=[^&]*(\\?|&(amp;)?)?",
+                "fb_ref=[^&]*(\\?|&(amp;)?)?",
+                "fb_source=[^&]*(\\?|&(amp;)?)?",
+                "action_object_map=[^&]*(\\?|&(amp;)?)?",
+                "action_type_map=[^&]*(\\?|&(amp;)?)?",
+                "action_ref_map=[^&]*(\\?|&(amp;)?)?"
             ],
             "exceptions": []
         },
@@ -91,6 +105,37 @@
             "completeProvider": true,
             "rules": [],
             "exceptions": []
+        },
+        "adsensecustomsearchads": {
+            "urlPattern": ".*(adsensecustomsearchads).*",
+            "completeProvider": true,
+            "rules": [],
+            "exceptions": []
+        },
+        "youtube": {
+            "urlPattern": "(https:\\/\\/||http:\\/\\/).*(\\.youtube\\.)\\w{2,}\\/.*",
+            "completeProvider": false,
+            "rules": [
+                "feature=[^&]*(\\?|&(amp;)?)?"
+            ],
+            "exceptions": []
+        },
+        "facebook": {
+            "urlPattern": "(https:\\/\\/||http:\\/\\/).*(\\.facebook\\.)\\w{2,}\\/.*",
+            "completeProvider": false,
+            "rules": [
+                "[a-zA-Z]*ref=[^&]*(\\?|&(amp;)?)?",
+                "hc_location=[^&]*(\\?|&(amp;)?)?"
+            ],
+            "exceptions": []
+        },
+        "imdb": {
+            "urlPattern": "(https:\\/\\/||http:\\/\\/).*(\\.imdb\\.com)\\/.*",
+            "completeProvider": false,
+            "rules": [
+                "ref_=[^&]*(\\?|&(amp;)?)?"
+            ],
+            "exceptions": []
         }
     }  
 }