diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
index 588d902c5e4..3b7ba0bc52e 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
@@ -256,7 +256,7 @@ class UserAgentParserEnhanced
         'Internet Explorer'  => array('IE', 'IM'),
         'Konqueror'          => array('KO'),
         'NetFront'           => array('NF'),
-        'Nokia Browser'      => array('NB'),
+        'Nokia Browser'      => array('NB', 'NO', 'NV'),
         'Opera'              => array('OP', 'OM', 'OI'),
         'Safari'             => array('SF', 'MF'),
         'Sailfish Browser'   => array('SA')
@@ -317,6 +317,8 @@ class UserAgentParserEnhanced
         'MS' => 'Mobile Silk',
         'MX' => 'Maxthon',
         'NB' => 'Nokia Browser',
+        'NO' => 'Nokia OSS Browser',
+        'NV' => 'Nokia Ovi Browser',
         'NF' => 'NetFront',
         'NL' => 'NetFront Life',
         'NS' => 'Netscape',
@@ -329,6 +331,7 @@ class UserAgentParserEnhanced
         'PL' => 'Palm Blazer',
         'PR' => 'Palm Pre',
         'PX' => 'Phoenix',
+        'PO' => 'Polaris',
         'RK' => 'Rekonq',
         'RM' => 'RockMelt',
         'SA' => 'Sailfish Browser',
diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml
index 3af94149396..7d9b1777833 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml
@@ -10,32 +10,32 @@
 
 #SailfishBrowser
 - regex: 'SailfishBrowser/(\d+\.\d+)'
-  name: Sailfish Browser
+  name: 'Sailfish Browser'
   version: '$1'
 
 # SeaMonkey
 - regex: '(Iceape|SeaMonkey|gnuzilla)/(\d+\.\d+)'
-  name: $1
+  name: '$1'
   version: '$2'
   
 # Camino
 - regex: 'Camino/(\d+\.\d+)'
-  name: Camino
+  name: 'Camino'
   version: '$1'
 
 #Fennec (Firefox for mobile)
 - regex: 'Fennec/(\d+\.\d+)'
-  name: Fennec
+  name: 'Fennec'
   version: '$1'
   
 #MicroB
 - regex: 'Firefox.*Tablet browser (\d+\.\d+)'
-  name: MicroB
+  name: 'MicroB'
   version: '$1'
   
 #Firefox
 - regex: 'Firefox/(\d+\.\d+)'
-  name: Firefox
+  name: 'Firefox'
   version: '$1'
 - regex: '(BonEcho|GranParadiso|Lorentz|Minefield|Namoroka|Shiretoko)/(\d+\.\d+)'
   name: Firefox '$1'
@@ -43,43 +43,43 @@
   
 #Flock
 - regex: 'Flock/(\d+\.\d+)'
-  name: Flock
+  name: 'Flock'
   version: '$1'
   
 #RockMelt
 - regex: 'RockMelt/(\d+\.\d+)'
-  name: RockMelt
+  name: 'RockMelt'
   version: '$1'
   
 #Netscape
 - regex: '(?:Navigator|Netscape6)/(\d+\.\d+)'
-  name: Netscape
+  name: 'Netscape'
   version: '$1'
 
 #Opera
 - regex: '(?:Opera Tablet.*Version|Opera/.+Opera Mobi.+Version|Mobile.+OPR)/(\d+\.\d+)'
-  name: Opera Mobile
+  name: 'Opera Mobile'
   version: '$1'
 - regex: 'Opera Mini/(?:att/)?(\d+\.\d+)'
-  name: Opera Mini
+  name: 'Opera Mini'
   version: '$1'
 - regex: '(?:Opera|OPR)[/ ](?:9.80.*Version/)?(\d+\.\d+)'
-  name: Opera
+  name: 'Opera'
   version: '$1'
   
 #wOSBrowser
 - regex: '(?:hpw|web)OS/(\d+\.\d+)'
-  name: wOSBrowser
+  name: 'wOSBrowser'
   version: '$1'
   
 #Swiftfox
 - regex: 'Firefox/(\d+\.\d+).*\(Swiftfox\)'
-  name: Swiftfox
+  name: 'Swiftfox'
   version: '$1'
   
 #Rekonq
 - regex: 'rekonq'
-  name: Rekonq
+  name: 'Rekonq'
   version: ''
 
 #CoolNovo
@@ -94,347 +94,347 @@
 
 #Conkeror
 - regex: 'Conkeror/(\d+\.\d+)'
-  name: Conkeror
+  name: 'Conkeror'
   version: '$1'
   
 #Konqueror
 - regex: 'Konqueror/(\d+\.\d+)'
-  name: Konqueror
+  name: 'Konqueror'
   version: '$1'
   
 #Baidu Browser
 - regex: 'baidubrowser[/ ](\d+)'
-  name: Baidu Browser
+  name: 'Baidu Browser'
   version: '$1'
   
 #Yandex Browser
 - regex: 'YaBrowser/(\d+)'
-  name: Yandex Browser
+  name: 'Yandex Browser'
   version: '$1'
   
 #Midori
 - regex: 'Midori/(\d+\.\d+)'
-  name: Midori
+  name: 'Midori'
   version: '$1'
 
 #Chrome
 - regex: 'CrMo/(\d+\.\d+)'
-  name: Chrome Mobile
+  name: 'Chrome Mobile'
   version: '$1'
 - regex: 'CriOS/(\d+\.\d+)'
-  name: Chrome Mobile iOS
+  name: 'Chrome Mobile iOS'
   version: '$1'
 - regex: 'Chrome/(\d+\.\d+).*Mobile'
-  name: Chrome Mobile
+  name: 'Chrome Mobile'
   version: '$1'
 - regex: 'chromeframe/(\d+\.\d+)'
-  name: Chrome Frame
+  name: 'Chrome Frame'
   version: '$1'
 - regex: 'Chrome/(\d+\.\d+)'
-  name: Chrome
+  name: 'Chrome'
   version: '$1'
 - regex: 'Chromium/(\d+\.\d+)'
-  name: Chromium
+  name: 'Chromium'
   version: '$1'
   
 #UC Browser
 - regex: 'UC[ ]?Browser[ /](\d+\.\d+)'
-  name: UC Browser
+  name: 'UC Browser'
   version: '$1'
 - regex: '(?:UC Browser|UCBrowser|UCWEB)(\d+\.\d+)'
-  name: UC Browser
+  name: 'UC Browser'
   version: '$1'
   
 #Tizen Browser
 - regex: '(?:Tizen|SLP) Browser/(\d+\.\d+)'
-  name: Tizen Browser
+  name: 'Tizen Browser'
   version: '$1'
   
 #Epiphany
 - regex: 'Epiphany/(\d+\.\d+)'
-  name: Epiphany
+  name: 'Epiphany'
   version: '$1'
   
 #Fireweb Navigator
 - regex: 'Fireweb Navigator/(\d+\.\d+)'
-  name: Fireweb Navigator
+  name: 'Fireweb Navigator'
   version: '$1'
   
 #Jasmine
 - regex: 'Jasmine[ /](\d+\.\d+)'
-  name: Jasmine
+  name: 'Jasmine'
   version: '$1'
   
 #Lynx
 - regex: 'Lynx/(\d+\.\d+)'
-  name: Lynx
+  name: 'Lynx'
   version: '$1'
   
 #NCSA Mosaic
 - regex: 'NCSA_Mosaic/(\d+\.\d+)'
-  name: NCSA Mosaic
+  name: 'NCSA Mosaic'
   version: '$1'
   
 #ABrowse
 - regex: 'ABrowse (\d+\.\d+)'
-  name: ABrowse
+  name: 'ABrowse'
   version: '$1'
   
 #Amaya
 - regex: 'amaya/(\d+\.\d+)'
-  name: Amaya
+  name: 'Amaya'
   version: '$1'
   
 #Amiga Voyager
 - regex: 'AmigaVoyager/(\d+\.\d+)'
-  name: Amiga Voyager
+  name: 'Amiga Voyager'
   version: '$1'
   
 #Amiga Aweb
 - regex: 'Amiga-Aweb/(\d+\.\d+)'
-  name: Amiga Aweb
+  name: 'Amiga Aweb'
   version: '$1'
   
 #Arora
 - regex: 'Arora/(\d+\.\d+)'
-  name: Arora
+  name: 'Arora'
   version: '$1'
   
 #Beonex
 - regex: 'Beonex/(\d+\.\d+)'
-  name: Beonex
+  name: 'Beonex'
   version: '$1'
   
 #BlackBerry Browser
 - regex: 'Black[bB]erry|PlayBook|BB10'
-  name: BlackBerry Browser
+  name: 'BlackBerry Browser'
   version: ''
   
 #BrowseX
 - regex: 'BrowseX \((\d+\.\d+)'
-  name: BrowseX
+  name: 'BrowseX'
   version: '$1'
   
 #Cheshire
 - regex: 'Cheshire/(\d+\.\d+)'
-  name: Cheshire
+  name: 'Cheshire'
   version: '$1'
   
 #CometBird
 - regex: 'CometBird/(\d+\.\d+)'
-  name: CometBird
+  name: 'CometBird'
   version: '$1'
   
 #Dillo
 - regex: 'Dillo/(\d+\.\d+)'
-  name: Dillo
+  name: 'Dillo'
   version: '$1'
   
 #Dolphin
 - regex: 'Dolfin/(\d+\.\d+)|dolphin'
-  name: Dolphin
+  name: 'Dolphin'
   version: '$1'
   
 #Elinks
 - regex: 'Elinks/(\d+\.\d+)'
-  name: Elinks
+  name: 'Elinks'
   version: '$1'
   
 #Firebird
 - regex: 'Firebird/(\d+\.\d+)'
-  name: Firebird
+  name: 'Firebird'
   version: '$1'
   
 #Fluid
 - regex: 'Fluid/(\d+\.\d+)'
-  name: Fluid
+  name: 'Fluid'
   version: '$1'
   
 #Galeon
 - regex: 'Galeon/(\d+\.\d+)'
-  name: Galeon
+  name: 'Galeon'
   version: '$1'
   
 #Google Earth
 - regex: 'Google Earth/(\d+\.\d+)'
-  name: Google Earth
+  name: 'Google Earth'
   version: '$1'
   
 #HotJava
 - regex: 'HotJava/(\d+\.\d+)'
-  name: HotJava
+  name: 'HotJava'
   version: '$1'
   
 #IBrowse
 - regex: 'IBrowse[ /](\d+\.\d+)'
-  name: IBrowse
+  name: 'IBrowse'
   version: '$1'
   
 #iCab
 - regex: 'iCab[ /](\d+\.\d+)'
-  name: iCab
+  name: 'iCab'
   version: '$1'
   
 #Internet Explorer
 - regex: 'IEMobile[ /](\d+\.\d+)'
-  name: IE Mobile
+  name: 'IE Mobile'
   version: '$1'
 - regex: 'MSIE.*Trident/4.0'
-  name: Internet Explorer
+  name: 'Internet Explorer'
   version: 8.0
 - regex: 'MSIE.*Trident/5.0'
-  name: Internet Explorer
+  name: 'Internet Explorer'
   version: 9.0
 - regex: 'MSIE.*Trident/6.0'
-  name: Internet Explorer
+  name: 'Internet Explorer'
   version: 10.0
 - regex: 'Trident/7.0'
-  name: Internet Explorer
+  name: 'Internet Explorer'
   version: 11.0
 - regex: 'MSIE (\d+\.\d+).*XBLWP7'
-  name: IE Mobile
+  name: 'IE Mobile'
   version: '$1'
 - regex: 'MSIE (\d+\.\d+)'
-  name: Internet Explorer
+  name: 'Internet Explorer'
   version: '$1'
 - regex: 'IE[ /](\d+\.\d+)'
-  name: Internet Explorer
+  name: 'Internet Explorer'
   version: '$1'
 
 #Iron
 - regex: 'Iron/(\d+\.\d+)'
-  name: Iron
+  name: 'Iron'
   version: '$1'
   
 #Kapiko
 - regex: 'Kapiko/(\d+\.\d+)'
-  name: Kapiko
+  name: 'Kapiko'
   version: '$1'
   
 #Kazehakase
 - regex: 'Kazehakase/(\d+\.\d+)'
-  name: Kazehakase
+  name: 'Kazehakase'
   version: '$1'
   
 #Kindle Browser
 - regex: 'Kindle/(\d+\.\d+)'
-  name: Kindle Browser
+  name: 'Kindle Browser'
   version: '$1'
   
 #K-meleon
 - regex: 'K-meleon/(\d+\.\d+)'
-  name: K-meleon
+  name: 'K-meleon'
   version: '$1'
   
 #Lightning
 - regex: 'Lightning/(\d+\.\d+)'
-  name: Lightning
+  name: 'Lightning'
   version: '$1'
   
 #Links
 - regex: 'Links \((\d+\.\d+)'
-  name: Links
+  name: 'Links'
   version: '$1'
   
 #Maxthon
 - regex: 'Maxthon (\d+\.\d+)'
-  name: Maxthon
+  name: 'Maxthon'
   version: '$1'
 - regex: '(?:Maxthon|MyIE2|Uzbl|Shiira)'
-  name: Maxthon
+  name: 'Maxthon'
   version: ''
   
 #Openwave Mobile Browser
 - regex: 'UP.Browser/(\d+\.\d+)'
-  name: Openwave Mobile Browser
+  name: 'Openwave Mobile Browser'
   version: '$1'
   
 #OmniWeb
 - regex: 'OmniWeb/[v]?(\d+\.\d+)'
-  name: OmniWeb
+  name: 'OmniWeb'
   version: '$1'
   
 #Phoenix
 - regex: 'Phoenix/(\d+\.\d+)'
-  name: Phoenix
+  name: 'Phoenix'
   version: '$1'
   
 #Mobile Silk
 - regex: 'Silk/(\d+\.\d+)'
-  name: Mobile Silk
+  name: 'Mobile Silk'
   version: '$1'
   
 #Nokia Browser
 - regex: '(?:NokiaBrowser|BrowserNG)/(\d+\.\d+)'
-  name: Nokia Browser
+  name: 'Nokia Browser'
   version: '$1'
 - regex: 'Series60/5\.0'
-  name: Nokia Browser
+  name: 'Nokia Browser'
   version: '7.0'
 - regex: 'Series60/(\d+\.\d+)'
-  name: Nokia OSS Browser
+  name: 'Nokia OSS Browser'
   version: '$1'
 - regex: 'S40OviBrowser/(\d+\.\d+)'
-  name: Nokia Ovi Browser
+  name: 'Nokia Ovi Browser'
   version: '$1'
 - regex: '^Nokia|Nokia[EN]?\d+'
-  name: Nokia Browser
+  name: 'Nokia Browser'
   version: ''
   
 #NetFront
 - regex: 'NetFrontLifeBrowser/(\d+\.\d+)'
-  name: NetFront Life
+  name: 'NetFront Life'
   version: '$1'
 - regex: 'NetFront/(\d+\.\d+)'
-  name: NetFront
+  name: 'NetFront'
   version: '$1'
 - regex: 'PLAYSTATION|NINTENDO 3|AppleWebKit.+ NX/\d+\.\d+\.\d+'
-  name: NetFront
+  name: 'NetFront'
   version: ''
   
 #Obigo
 - regex: 'Obigo[ ]?(?:InternetBrowser|Browser)?[ /]([a-z0-9]*)'
-  name: Obigo
+  name: 'Obigo'
   version: '$1'
 - regex: 'Obigo|Teleca'
-  name: Obigo
+  name: 'Obigo'
   version: ''
   
 #Palm Blazer
 - regex: 'Blazer/(\d+\.\d+)'
-  name: Palm Blazer
+  name: 'Palm Blazer'
   version: '$1'
 - regex: 'Pre/(\d+\.\d+)'
-  name: Palm Pre
+  name: 'Palm Pre'
   version: '$1'
   
 #Polaris
 - regex: '(?:Polaris|Embider)/(\d+\.\d+)'
-  name: Polaris
+  name: 'Polaris'
   version: '$1'
   
 #Snowshoe
 - regex: 'Snowshoe/(\d+\.\d+)'
-  name: Snowshoe
+  name: 'Snowshoe'
   version: '$1'
 
   #Android Browser
 - regex: 'Android'
-  name: Android Browser
+  name: 'Android Browser'
   version: ''
   
 #Safari
 - regex: '(?:iPod|iPad|iPhone).+Version/(\d+\.\d+)'
-  name: Mobile Safari
+  name: 'Mobile Safari'
   version: '$1'
 - regex: 'Version/(\d+\.\d+).*Mobile.*Safari/'
-  name: Mobile Safari
+  name: 'Mobile Safari'
   version: '$1'
 - regex: '(?:iPod|iPhone|iPad)'
-  name: Mobile Safari
+  name: 'Mobile Safari'
   version: ''
 - regex: 'Version/(\d+\.\d+).*Safari/|Safari/\d+'
-  name: Safari
+  name: 'Safari'
   version: '$1'