diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "referer-parser",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "library for extracting marketing attribution data (such as search terms) from referrer URLs",
   "main": "index.js",
   "scripts": {
@@ -15,9 +15,9 @@
     }
   ],
   "dependencies": {
-    "js-yaml": "~2.1.0"
+    "js-yaml": "^4.1.0"
   },
   "devDependencies": {
-    "mocha": "~1.12.0"
+    "mocha": "~10.2.0"
   }
 }
diff --git a/index.js b/index.js
--- a/index.js
+++ b/index.js
@@ -123,11 +123,10 @@
           ref_path, include_path
       )
     } catch (e) {
-      console.error(e)
       return null
     }
   } else return referer
 };
 
 // var r = new Referer("http://www.google.com/search?q=gateway+oracle+cards+denise+linn&hl=en&client=safari")
-// console.log(r.uri)
\ No newline at end of file
+// console.log(r.uri)
diff --git a/data/referers.yml b/data/referers.yml
--- a/data/referers.yml
+++ b/data/referers.yml
@@ -1,9 +1,3 @@
-#################################### DO NOT EDIT THIS FILE ####################################
-#                                                                                             #  
-#             This file will be overwritten the next time ./sync_yaml.sh is run!              #
-#                                                                                             #
-#################################### DO NOT EDIT THIS FILE ####################################
-
 # #######################################################################################################
 #
 # ALL SUPPORTED REFERERS
@@ -14,6 +8,7 @@
 # 2. Email providers
 # 3. Social providers
 # 4. Search providers
+# 5. Paid media
 
 
 # #######################################################################################################
@@ -35,7 +30,6 @@
       - sites.google.com
       - groups.google.com
       - groups.google.co.uk
-      - news.google.co.uk
 
   Yahoo!:
     domains:
@@ -57,6 +51,15 @@
       - omg.yahoo.com
       - match.yahoo.net
 
+  Yandex Maps:
+    parameters:
+      - text
+    domains:
+      - maps.yandex.ru
+      - maps.yandex.ua
+      - maps.yandex.com
+      - maps.yandex.by
+      - n.maps.yandex.ru
 
 # #######################################################################################################
 #
@@ -64,23 +67,167 @@
 
 email:
 
+  126 Mail:
+    domains:
+      - mail.126.com
+
+  163 Mail:
+    domains:
+      - mail.163.com
+
+  2degrees:
+    domains:
+      - webmail.2degreesbroadband.co.nz
+
+  Adam Internet:
+    domains:
+      - webmail.adam.com.au
+
+  AOL Mail:
+    domains:
+      - mail.aol.com
+
+  Beeline:
+    domains:
+      - post.ru
+
+  Bigpond:
+    domains:
+      - webmail.bigpond.com
+      - webmail2.bigpond.com
+      - email.telstra.com
+      - basic.messaging.bigpond.com
+
+  Commander:
+    domains:
+      - webmail.commander.net.au
+
+  Daum Mail:
+    domains:
+      - mail2.daum.net
+      - mail.daum.net
+
+  Dodo:
+    domains:
+      - webmail.dodo.com.au
+
+  E1.ru:
+    domains:
+      - mail.e1.ru
+
+  Freenet:
+    domains:
+      - webmail.freenet.de
+
   Gmail:
     domains:
       - mail.google.com
+      - inbox.google.com
+
+  iiNet:
+    domains:
+      - webmail.iinet.net.au
+      - mail.iinet.net.au
+
+  Inbox.com:
+    domains:
+      - inbox.com
+
+  iPrimus:
+    domains:
+      - webmail.iprimus.com.au
+
+  Mail.ru:
+    domains:
+      - e.mail.ru
+      - touch.mail.ru
+
+  Mastermail:
+    domains:
+      - mastermail.ru
+      - m.mastermail.ru
+
+  Mynet Mail:
+    domains:
+      - mail.mynet.com
+
+  Naver Mail:
+    domains:
+      - mail.naver.com
+
+  Netspace:
+    domains:
+      - webmail.netspace.net.au
+
+  Optus Zoo:
+    domains:
+      - webmail.optuszoo.com.au
+      - webmail.optusnet.com.au
+
+  Orange Webmail:
+    domains:
+      - orange.fr/webmail
 
   Outlook.com:
     domains:
       - mail.live.com
+      - outlook.live.com
+
+  QIP:
+    domains:
+      - mail.qip.ru
+
+  QQ Mail:
+    domains:
+      - mail.qq.com
+      - exmail.qq.com
+
+  Rambler:
+    domains:
+      - mail.rambler.ru 
+
+  Seznam Mail:
+    domains:
+      - email.seznam.cz
+
+  Sibmail:
+    domains:
+      - sibmail.com
+
+  Ukr.net:
+    domains:
+      - mail.ukr.net
+
+  Virgin:
+    domains:
+      - webmail.virginbroadband.com.au
+
+  Vodafone:
+    domains:
+      - webmail.vodafone.co.nz
+
+  Westnet:
+    domains:
+      - webmail.westnet.com.au
+
+  Yandex:
+    domains:
+      - mail.yandex.ru
+      - mail.yandex.com
+      - mail.yandex.kz
+      - mail.yandex.ua
+      - mail.yandex.by
 
   Yahoo! Mail:
     domains:
       - mail.yahoo.net
       - mail.yahoo.com
       - mail.yahoo.co.uk
+      - mail.yahoo.co.jp
 
-  Orange Webmail:
+  Zoho:
     domains:
-      - orange.fr/webmail
+      - mail.zoho.com
 
 # #######################################################################################################
 #
@@ -92,6 +239,9 @@
     domains:
       - facebook.com
       - fb.me
+      - m.facebook.com
+      - l.facebook.com
+      - lm.facebook.com
 
   Qzone:
     domains:
@@ -106,6 +256,20 @@
       - twitter.com
       - t.co
 
+  Instagram:
+    domains:
+      - instagram.com
+      - l.instagram.com
+
+  Youtube:
+    domains:
+      - youtube.com
+      - youtu.be
+
+  Vimeo:
+    domains:
+      - vimeo.com
+
   Renren:
     domains:
       - renren.com
@@ -117,6 +281,7 @@
   LinkedIn:
     domains:
       - linkedin.com
+      - lnkd.in
 
   Bebo:
     domains:
@@ -124,7 +289,9 @@
 
   Vkontakte:
     domains:
+      - m.vk.com
       - vk.com
+      - away.vk.com
       - vkontakte.ru
 
   Tagged:
@@ -133,7 +300,7 @@
 
   Orkut:
     domains:
-      - orkut.com 
+      - orkut.com
 
   Myspace:
     domains:
@@ -187,6 +354,7 @@
   Odnoklassniki:
     domains:
       - odnoklassniki.ru
+      - ok.ru
 
   Viadeo:
     domains:
@@ -194,7 +362,7 @@
 
   Flickr:
     domains:
-      - flickr.com 
+      - flickr.com
 
   WeeWorld:
     domains:
@@ -226,7 +394,7 @@
 
   Skyrock:
     domains:
-      - skyrock.com 
+      - skyrock.com
 
   BlackPlanet:
     domains:
@@ -263,6 +431,8 @@
   Pinterest:
     domains:
       - pinterest.com
+      - pinterest.ca
+      - pinterest.com.au
 
   Plaxo:
     domains:
@@ -278,7 +448,7 @@
 
   XING:
     domains:
-      - xing.com 
+      - xing.com
 
   Taringa!:
     domains:
@@ -287,6 +457,7 @@
   Tumblr:
     domains:
       - tumblr.com
+      - t.umblr.com
 
   Nasza-klasa.pl:
     domains:
@@ -310,7 +481,7 @@
 
   Buzznet:
     domains:
-      - wayn.com
+      - buzznet.com
 
   Multiply:
     domains:
@@ -349,6 +520,67 @@
       - weibo.com
       - t.cn
 
+  Delicious:
+    domains:
+      - delicious.com
+
+  Pocket:
+    domains:
+      - getpocket.com
+
+  ITU Sozluk:
+    domains:
+      - itusozluk.com
+
+  Instela:
+    domains:
+      - instela.com
+
+  Eksi Sozluk:
+    domains:
+      - Sozluk.com
+      - sourtimes.org
+
+  Uludag Sozluk:
+    domains:
+      - uludagsozluk.com
+      - ulusozluk.com
+
+  Inci Sozluk:
+    domains:
+      - inci.sozlukspot.com
+      - incisozluk.com
+      - incisozluk.cc
+
+  Hocam.com:
+    domains:
+      - hocam.com
+
+  Donanimhaber:
+    domains:
+      - donanimhaber.com
+
+  Disqus:
+    domains:
+      - redirect.disqus.com
+      - disq.us
+      - disqus.com
+
+  Quora:
+    domains:
+      - quora.com
+
+  Skype:
+    domains:
+      - web.skype.com
+
+  WhatsApp:
+    domains:
+      - web.whatsapp.com
+
+  Whirlpool:
+    domains:
+      - forums.whirlpool.net.au
 
 # #######################################################################################################
 #
@@ -357,24 +589,44 @@
 search:
 
   1.cz:
-    parameters: 
+    parameters:
       - q
     domains:
       - 1.cz
 
   # 123people TODO
 
+  1&1:
+    parameters:
+      - q
+    domains:
+      - search.1and1.com
+
   1und1:
-    parameters: 
+    parameters:
       - su
     domains:
       - search.1und1.de
 
+  2gis:
+    domains:
+      - 2gis.ru
+      - www.2gis.ru
+      - link.2gis.ru
+      - www.link.2gis.ru
+
+  360.cn:
+    parameters:
+      - q
+    domains:
+      - so.360.cn
+      - www.so.com
+
   Abacho:
-    parameters: 
+    parameters:
       - q
     domains:
-      - www.abacho.de 
+      - www.abacho.de
       - www.abacho.com
       - www.abacho.co.uk
       - www.se.abacho.com
@@ -386,45 +638,45 @@
       - www.abacho.it
 
   ABCsøk:
-    parameters: 
+    parameters:
       - q
     domains:
       - abcsolk.no
       - verden.abcsok.no
 
   Acoon:
-    parameters: 
+    parameters:
       - begriff
     domains:
       - www.acoon.de
 
   Alexa:
-    parameters: 
+    parameters:
       - q
     domains:
       - alexa.com
       - search.toolbars.alexa.com
 
   Alice Adsl:
-    parameters: 
+    parameters:
       - q
     domains:
       - rechercher.aliceadsl.fr
 
   AllTheWeb:
-    parameters: 
+    parameters:
       - q
-    domains: 
+    domains:
       - www.alltheweb.com
 
   all.by:
-    parameters: 
+    parameters:
       - query
     domains:
       - all.by
 
   Altavista:
-    parameters: 
+    parameters:
       - q
     domains:
       - www.altavista.com
@@ -435,18 +687,28 @@
       - be-nl.altavista.com
       - be-fr.altavista.com
 
+  Amazon:
+    parameters:
+      - keywords
+    domains:
+      - amazon.com
+      - www.amazon.com
+
   AOL:
-    parameters: 
+    parameters:
       - q
+      - query
     domains:
       - search.aol.com
       - search.aol.it
       - aolsearch.aol.com
+      - aolsearch.com
       - www.aolrecherche.aol.fr
       - www.aolrecherches.aol.fr
       - www.aolimages.aol.fr
       - aim.search.aol.com
       - www.recherche.aol.fr
+      - recherche.aol.fr
       - find.web.aol.com
       - recherche.aol.ca
       - aolsearch.aol.co.uk
@@ -465,13 +727,13 @@
       - search-intl.netscape.com
 
   Apollo Latvia:
-    parameters: 
+    parameters:
       - q
-    domains: 
+    domains:
       - apollo.lv/portal/search/
 
   APOLL07:
-    parameters: 
+    parameters:
       - query
     domains:
       - apollo7.de
@@ -484,35 +746,36 @@
       - www.apontador.com.br
 
   Aport:
-    parameters: 
+    parameters:
       - r
     domains:
       - sm.aport.ru
 
   arama:
-    parameters: 
+    parameters:
       - q
     domains:
       - arama.com
 
   Arcor:
-    parameters: 
+    parameters:
       - Keywords
     domains:
       - www.arcor.de
 
   Arianna:
-    parameters: 
+    parameters:
       - query
     domains:
       - arianna.libero.it
       - www.arianna.com
 
   Ask:
-    parameters: 
+    parameters:
       - q
     domains:
       - ask.com
+      - www.ask.com
       - web.ask.com
       - int.ask.com
       - mws.ask.com
@@ -528,28 +791,34 @@
       - www.search-results.com
       - int.search-results.com
 
+  Ask Toolbar:
+    parameters:
+      - searchfor
+    domains:
+      - search.tb.ask.com
+
   Atlas:
-    parameters: 
+    parameters:
       - q
     domains:
       - searchatlas.centrum.cz
 
   Austronaut:
-    parameters: 
+    parameters:
       - q
     domains:
       - www2.austronaut.at
       - www1.astronaut.at
 
   Babylon:
-    parameters: 
+    parameters:
       - q
-    domains: 
+    domains:
      - search.babylon.com
      - searchassist.babylon.com
 
   Baidu:
-    parameters: 
+    parameters:
       - wd
       - word
       - kw
@@ -561,9 +830,10 @@
       - tieba.baidu.com
       - news.baidu.com
       - web.gougou.com
+      - m.baidu.com
 
   Biglobe:
-    parameters: 
+    parameters:
       - q
     domains:
       - cgi.search.biglobe.ne.jp
@@ -612,6 +882,12 @@
     domains:
       - search.bluewin.ch
 
+  British Telecommunications:
+    parameters:
+      - p
+    domains:
+      - search.bt.com
+
   canoe.ca:
     parameters:
       - q
@@ -625,6 +901,12 @@
       - serach.centrum.cz
       - morfeo.centrum.cz
 
+  Certified-Toolbar:
+    parameters:
+      - q
+    domains:
+      - search.certified-toolbar.com
+
   Charter:
     parameters:
       - q
@@ -674,6 +956,12 @@
       - daemon-search.com
       - my.daemon-search.com
 
+  Dalesearch:
+    parameters:
+      - q
+    domains:
+      - www.dalesearch.com
+
   DasOertliche:
     parameters:
       - kw
@@ -717,7 +1005,13 @@
       - dmoz.org
       - editors.dmoz.org
 
-  DuckDuckGoL:
+  Dodo:
+    parameters:
+      - q
+    domains:
+      - google.dodo.com.au
+
+  DuckDuckGo:
     parameters:
       - q
     domains:
@@ -799,6 +1093,18 @@
     domains:
       - recherche.francite.com
 
+  Finderoo:
+    parameters:
+      - q
+    domains:
+      - www.finderoo.com
+
+  Findwide:
+    parameters:
+      - k
+    domains:
+      - search.findwide.com
+
   Fireball:
     parameters:
       - q
@@ -852,6 +1158,12 @@
     domains:
       - suche.freenet.de
 
+  Freshweather:
+    parameters:
+      - q
+    domains:
+      - www.fresh-weather.com
+
   FriendFeed:
     parameters:
       - q
@@ -870,6 +1182,12 @@
     domains:
       - geona.net
 
+  Genieo:
+    parameters:
+      - q
+    domains:
+      - search.genieo.com
+
   Gigablast:
     parameters:
       - q
@@ -877,6 +1195,13 @@
       - www.gigablast.com
       - dir.gigablast.com
 
+  Globososo:
+    parameters:
+      - q
+    domains:
+      - searches.globososo.com
+      - search.globososo.com
+
   GMX:
     parameters:
       - su
@@ -1003,7 +1328,6 @@
       - www.google.jo
       - www.google.co.jp
       - www.google.co.ke
-      - www.google.com.kh
       - www.google.ki
       - www.google.kg
       - www.google.co.kr
@@ -1084,6 +1408,7 @@
       - www.google.tm
       - www.google.to
       - www.google.com.tn
+      - www.google.tn
       - www.google.com.tr
       - www.google.tt
       - www.google.com.tw
@@ -1200,7 +1525,6 @@
       - google.jo
       - google.co.jp
       - google.co.ke
-      - google.com.kh
       - google.ki
       - google.kg
       - google.co.kr
@@ -1302,6 +1626,7 @@
       - google.co.za
       - google.co.zm
       - google.co.zw
+      - google.tn
       # powered by Google
       - search.avg.com
       - isearch.avg.com
@@ -1414,7 +1739,6 @@
       - blogsearch.google.com.hk
       - blogsearch.google.com.jm
       - blogsearch.google.com.kh
-      - blogsearch.google.com.kh
       - blogsearch.google.com.kw
       - blogsearch.google.com.lb
       - blogsearch.google.com.lc
@@ -1616,7 +1940,6 @@
       - google.com.hk/imgres
       - google.com.jm/imgres
       - google.com.kh/imgres
-      - google.com.kh/imgres
       - google.com.kw/imgres
       - google.com.lb/imgres
       - google.com.lc/imgres
@@ -1813,7 +2136,6 @@
       - images.google.com.hk
       - images.google.com.jm
       - images.google.com.kh
-      - images.google.com.kh
       - images.google.com.kw
       - images.google.com.lb
       - images.google.com.lc
@@ -1933,7 +2255,6 @@
       - images.google.us
       - images.google.vg
       - images.google.vu
-      - images.google.ws
 
   Google News:
     parameters:
@@ -2015,7 +2336,6 @@
       - news.google.com.hk
       - news.google.com.jm
       - news.google.com.kh
-      - news.google.com.kh
       - news.google.com.kw
       - news.google.com.lb
       - news.google.com.lc
@@ -2217,7 +2537,6 @@
       - google.com.hk/products
       - google.com.jm/products
       - google.com.kh/products
-      - google.com.kh/products
       - google.com.kw/products
       - google.com.lb/products
       - google.com.lc/products
@@ -2414,7 +2733,6 @@
       - www.google.com.hk/products
       - www.google.com.jm/products
       - www.google.com.kh/products
-      - www.google.com.kh/products
       - www.google.com.kw/products
       - www.google.com.lb/products
       - www.google.com.lc/products
@@ -2561,7 +2879,7 @@
       - www.highbeam.com
 
   Hit-Parade:
-    parameters: 
+    parameters:
       - p7
     domains:
       - req.-hit-parade.com
@@ -2605,6 +2923,21 @@
     domains:
       - www.ilse.nl
 
+  Inbox.com:
+    parameters:
+      - q
+    domains:
+      - inbox.com/search/
+
+  Indeed:
+    domains:
+      - de.indeed.com
+      - at.indeed.com
+      - fr.indeed.com
+      - it.indeed.com
+      - ch.indeed.com
+      - au.indeed.com
+
   InfoSpace:
     parameters:
       - q
@@ -2624,6 +2957,13 @@
       - search.searchcompletion.com
       - clusty.com
 
+  Flyingbird:
+    parameters:
+      - q
+    domains:
+      - inspsearch.com
+      - viview.inspsearch.com
+
   Interia:
     parameters:
       - q
@@ -2636,6 +2976,12 @@
     domains:
       - start.iplay.com
 
+  I.ua:
+    parameters:
+      - q
+    domains:
+      - search.i.ua
+
   IXquick:
     parameters:
       - query
@@ -2685,6 +3031,12 @@
     domains:
       - www.kvasir.no
 
+  kununu:
+    parameters:
+      - q
+    domains:
+      - kununu.com
+
   Latne:
     parameters:
       - q
@@ -2698,6 +3050,18 @@
       - www.toile.com
       - web.toile.com
 
+  Lilo:
+    parameters:
+      - q
+    domains:
+      - search.lilo.org
+
+  Liveinternet:
+    parameters:
+      - q
+    domains:
+      - liveinternet.ru
+
   Looksmart:
     parameters:
       - key
@@ -2728,6 +3092,8 @@
     parameters:
       - q
     domains:
+      - mail.ru
+      - m.mail.ru
       - go.mail.ru
 
   Mamma:
@@ -2737,6 +3103,18 @@
       - www.mamma.com
       - mamma75.mamma.com
 
+  Marktplaats:
+    parameters:
+      - query
+    domains:
+      - www.marktplaats.nl
+
+  Maxwebsearch:
+    parameters:
+      - query
+    domains:
+      - maxwebsearch.com
+
   Meta:
     parameters:
       - q
@@ -2771,12 +3149,27 @@
       - www.meinestadt.de
 
   Mister Wong:
-    parameters: 
+    parameters:
       - Keywords
     domains:
       - www.mister-wong.com
       - www.mister-wong.de
 
+  Monster:
+    parameters:
+      - q
+    domains:
+      - www.monster.be
+      - www.monster.cz
+      - www.monster.de
+      - www.monster.fi
+      - www.monster.fr
+      - www.monster.ie
+      - www.monster.it
+      - www.monster.lu
+      - www.monster.ch
+      - www.monster.co.uk
+
   Monstercrawler:
     parameters:
       - qry
@@ -2802,6 +3195,7 @@
       - searchfor
       - searchFor
     domains:
+      - mysearch.com
       - www.mysearch.com
       - ms114.mysearch.com
       - ms146.mysearch.com
@@ -2828,6 +3222,13 @@
     domains:
       - search.naver.com
 
+  Naver Images:
+    parameters:
+      - query
+    domains:
+      - image.search.naver.com
+      - imagesearch.naver.com
+
   Needtofind:
     parameters:
       - searchfor
@@ -2873,9 +3274,11 @@
   Orange:
     parameters:
       - q
+      - kw
     domains:
       - busca.orange.es
       - search.orange.co.uk
+      - lemoteur.orange.fr
 
   Paperball:
     parameters:
@@ -2905,7 +3308,7 @@
     parameters:
       - q
     domains:
-      - www.plazoo.com
+      - poisk.ru
 
   PriceRunner:
     parameters:
@@ -2914,7 +3317,7 @@
       - www.pricerunner.co.uk
 
   qip:
-    parameters: 
+    parameters:
       - query
     domains:
       - search.qip.ru
@@ -2928,6 +3331,13 @@
       - www.qualigo.de
       - www.qualigo.nl
 
+  Qwant:
+    parameters:
+      - q
+    domains:
+      - www.qwant.com
+      - lite.qwant.com
+
   Rakuten:
     parameters:
       - qt
@@ -2935,7 +3345,7 @@
       - websearch.rakuten.co.jp
 
   Rambler:
-    parameters: 
+    parameters:
      - query
      - words
     domains:
@@ -2943,8 +3353,7 @@
 
   RPMFind:
     parameters:
-      - rpmfind.net
-      - fr2.rpmfind.net
+      - query
     domains:
       - rpmfind.net
       - fr2.rpmfind.net
@@ -2963,6 +3372,12 @@
 
   # Add Scour.com
 
+  Search This:
+    parameters:
+      - q
+    domains:
+      - www.searchthis.com
+
   Search.com:
     parameters:
       - q
@@ -3013,11 +3428,20 @@
     domains:
       - www.skynet.be
 
+  The Smart Search:
+    parameters:
+      - q
+    domains:
+      - thesmartsearch.net
+      - www.thesmartsearch.net
+
   Sogou:
     parameters:
       - query
+      - w
     domains:
       - www.sougou.com
+      - www.soso.com
 
   Softonic:
     parameters:
@@ -3025,11 +3449,30 @@
     domains:
       - search.softonic.com
 
-  soso.com:
+  SoSoDesk:
     parameters:
-      - w
+      - q
     domains:
-      - www.soso.com
+      - sosodesktop.com
+      - search.sosodesktop.com
+
+  Shenma:
+    parameters:
+      - q
+    domains:
+      - so.m.sm.cn
+      - yz.m.sm.cn
+      - m.sm.cn
+      - quark.sm.cn
+      - m.sp.sm.cn
+      - m.yz2.sm.cn
+      - m.yz.sm.cn
+
+  Snapdo:
+    parameters:
+      - q
+    domains:
+      - search.snapdo.com
 
   Startpagina:
     parameters:
@@ -3043,6 +3486,16 @@
     domains:
       - www.startsiden.no
 
+  StepStone:
+    domains:
+      - www.stepstone.de
+      - www.stepstone.at
+      - www.stepstone.be
+      - www.stepstone.fr
+      - www.stepstone.nl
+      - www.stepstone.dk
+      - www.stepstone.se
+
   suche.info:
     parameters:
       - q
@@ -3068,11 +3521,17 @@
       - www.talktalk.co.uk
 
   Technorati:
-    parameters: 
+    parameters:
       - q
     domains:
       - technorati.com
 
+  Telstra:
+    parameters:
+      - find
+    domains:
+      - search.media.telstra.com.au
+
   Teoma:
     parameters:
       - q
@@ -3135,12 +3594,24 @@
     domains:
       - www.trusted--search.com
 
+  Tut.by:
+    parameters:
+      - query
+    domains:
+      - search.tut.by
+
   Twingly:
     parameters:
       - q
     domains:
       - www.twingly.com
 
+  UKR.net:
+    parameters:
+      - q
+    domains:
+      - search.ukr.net
+
   uol.com.br:
     parameters:
       - q
@@ -3179,6 +3650,7 @@
   Voila:
     parameters:
       - rdata
+      - kw
     domains:
       - search.ke.voila.fr
       - www.lemoteur.fr
@@ -3199,7 +3671,7 @@
       - www.walhello.nl
 
   Web.de:
-    parameters: 
+    parameters:
       - su
     domains:
       - suche.web.de
@@ -3266,6 +3738,8 @@
       - au.yahoo.com
       - br.search.yahoo.com
       - br.yahoo.com
+      - ca.search.yahoo.com
+      - ca.yahoo.com
       - cade.searchde.yahoo.com
       - cade.yahoo.com
       - chinese.searchinese.yahoo.com
@@ -3279,13 +3753,15 @@
       - es.search.yahoo.com
       - es.yahoo.com
       - espanol.searchpanol.yahoo.com
-      - espanol.searchpanol.yahoo.com
-      - espanol.yahoo.com
       - espanol.yahoo.com
       - fr.search.yahoo.com
       - fr.yahoo.com
+      - hk.search.yahoo.com
+      - hk.yahoo.com
       - ie.search.yahoo.com
       - ie.yahoo.com
+      - in.search.yahoo.com
+      - in.yahoo.com
       - it.search.yahoo.com
       - it.yahoo.com
       - kr.search.yahoo.com
@@ -3299,17 +3775,18 @@
       - one.cn.yahoo.com
       - one.searchn.yahoo.com
       - qc.search.yahoo.com
-      - qc.search.yahoo.com
-      - qc.search.yahoo.com
-      - qc.yahoo.com
       - qc.yahoo.com
-      - se.search.yahoo.com
+      - ru.search.yahoo.com
+      - ru.yahoo.com
       - se.search.yahoo.com
       - se.yahoo.com
       - search.searcharch.yahoo.com
-      - search.yahoo.com
+      - tw.search.yahoo.com
+      - tw.yahoo.com
       - uk.search.yahoo.com
       - uk.yahoo.com
+      - us.search.yahoo.com
+      - us.yahoo.com
       - www.yahoo.co.jp
       - search.yahoo.co.jp
       # powered by Yahoo
@@ -3338,9 +3815,15 @@
       - yandex.ru
       - yandex.ua
       - yandex.com
+      - yandex.by
       - www.yandex.ru
       - www.yandex.ua
       - www.yandex.com
+      - www.yandex.by
+      - clck.yandex.ru
+      - clck.yandex.ua
+      - clck.yandex.com
+      - clck.yandex.by
 
   Yandex Images:
     parameters:
@@ -3349,11 +3832,12 @@
       - images.yandex.ru
       - images.yandex.ua
       - images.yandex.com
+      - images.yandex.by
 
   Yasni:
     parameters:
       - query
-    domains: 
+    domains:
       - www.yasni.de
       - www.yasni.com
       - www.yasni.co.uk
@@ -3366,7 +3850,7 @@
     domains:
       - www.yatedo.com
       - www.yatedo.fr
-    
+
   # Add Yellowmap:
 
   Yippy:
@@ -3415,3 +3899,227 @@
       - q
     domains:
       - zoohoo.cz
+
+
+
+# #######################################################################################################
+#
+# PAID MEDIA
+
+paid:
+
+  Acuity Ads:
+    domains:
+      - acuityplatform.com
+
+  Adform:
+    domains:
+      - adform.net
+
+  ADFOX:
+    domains:
+      - adfox.ru
+      - www.adfox.ru
+      - ads.adfox.ru
+      - www.ads.adfox.ru
+
+  Adition:
+    domains:
+      - adition.com
+
+  AdNET:
+    domains:
+      - adnet.de
+
+  AdRoll:
+    domains:
+      - adroll.com
+
+  AdSpirit:
+    domains:
+      - adspirit.de
+      - rtbcity.com
+      - plusperformance.com
+
+  AppNexus:
+    domains:
+      - ib.adnxs.com
+      - adnxs.com
+      - 247realmedia.com
+
+  AudienceScience:
+    domains:
+      - wunderloop.net
+
+  BidSwitch:
+    domains:
+      - bidswitch.net
+
+  Casale Media:
+    domains:
+      - casalemedia.com
+
+  Criteo:
+    domains:
+      - cas.jp.as.criteo.com
+      - cas.criteo.com
+
+  Doubleclick:
+    domains:
+      - ad.doubleclick.net
+      - ad-apac.doubleclick.net
+      - s0.2mdn.net
+      - s1.2mdn.net
+      - dp.g.doubleclick.net
+      - pubads.g.doubleclick.net
+
+  Eyeota:
+    domains:
+      - eyeota.net
+
+  Flashtalking:
+    domains:
+      - flashtalking.com
+      - servedby.flashtalking.com
+
+  Fluct:
+    domains:
+      - adingo.jp
+
+  Google:
+    domains:
+      - www.googleadservices.com
+      - partner.googleadservices.com
+      - googleads.g.doubleclick.net
+      - tpc.googlesyndication.com
+      - googleadservices.com
+      - imasdk.googleapis.com
+
+  LifeStreet:
+    domains:
+      - lfstmedia.com
+
+  LowerMyBills:
+    parameters:
+      - leadid
+    domains:
+      - lowermybills.com
+
+  Jivox:
+    domains:
+      - jivox.com
+
+  MicroAd:
+    domains:
+      - microad.jp
+
+  Mixpo:
+    domains:
+      - mixpo.com
+
+  Mozo:
+    domains:
+      - mozo.com.au
+      - a.mozo.com.au
+
+  Neustar AdAdvisor:
+    domains:
+      - adadvisor.net
+
+  ONE by AOL:
+    domains:
+      - nexage.com
+
+  OpenX:
+    domains:
+      - us-ads.openx.net
+      - openx.net
+      - servedbyopenx.com
+      - openxenterprise.com
+
+  Outbrain:
+    domains:
+      - paid.outbrain.com
+
+  Plista:
+    domains:
+      - farm.plista.com
+
+  Price.ru:
+    domains:
+      - price.ru
+      - v.price.ru
+
+  PubMatic:
+    domains:
+      - sshowads.pubmatic.com
+
+  Rubicon Project:
+    domains:
+      - optimized-by.rubiconproject.com
+
+  Sizmek:
+    domains:
+      - bs.serving-sys.com
+
+  Sociomantic Labs:
+    domains:
+      - sociomantic.com
+
+  Sonobi:
+    domains:
+      - sonobi.com
+
+  Sovrn:
+    domains:
+      - lijit.com
+
+  SteelHouse:
+    domains:
+      - steelhousemedia.com
+
+  StickyADS.tv:
+    domains:
+      - stickyadstv.com
+      - sfx.stickyadstv.com
+
+  Taboola:
+    domains:
+      - trc.taboola.com
+      - api.taboola.com
+      - taboola.com
+
+  Torg.Mail.ru:
+    domains:
+      - torg.mail.ru
+
+  Tribal Fusion:
+    domains:
+      - cdnx.tribalfusion.com
+
+  White Pages:
+    domains:
+      - www.whitepages.com.au
+      - mobile.whitepages.com.au
+
+  Yandex.Direct:
+    domains:
+      - an.yandex.ru
+      - yabs.yandex.ru
+      - yabs.yandex.ua
+      - yabs.yandex.com
+      - yabs.yandex.by
+
+  Yandex.Market:
+    domains:
+      - market.yandex.ru
+      - m.market.yandex.ru
+
+  Yieldmo:
+    domains:
+      - yieldmo.com
+
+  ZEDO:
+    domains:
+      - zedo.com
+      - z1.zedo.com