diff --git a/CHANGELOG b/CHANGELOG
index d3b09fa..7f67c45 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,10 @@
 + implement fitlers support to ExtScripts (ApiVer = 3) (#53)
 + implement ability to wrap `\n` as new lines (#53)
 + implement key sorting in comboboxes
-+ implement (perc)(bid|ask|price)chg tag support
++ implement (perc)(bid|ask|price)chg tag support (ApiVer = 2)
++ implement timeouts to quotes (#54)
 - fix bug with invalid html parsing
+* move from XML to JSON in ExtQuotes (ApiVer = 2)
 * more pretty configuration UI
 * some part of refactoring
 
diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
index c0f56e7..81b1e26 100644
--- a/sources/awesome-widget/plugin/awkeys.cpp
+++ b/sources/awesome-widget/plugin/awkeys.cpp
@@ -369,6 +369,7 @@ bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
     if (sourceName == QString("update")) return true;
 
     // checking
+    if (toolTip == nullptr) return false;
     if (!checkKeys(data)) return false;
     if (keys.isEmpty()) return false;
 
@@ -403,9 +404,8 @@ bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
                     values[QString("ac")] = params[QString("acOffline")].toString();
             } else {
                 values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toFloat(), 3, 'f', 0);
-                if (toolTip != nullptr) toolTip->setData(QString("batTooltip"),
-                                                         data[data.keys()[i]].toFloat(),
-                                                         data[QString("ac")].toBool());
+                toolTip->setData(QString("batTooltip"), data[data.keys()[i]].toFloat(),
+                                 data[QString("ac")].toBool());
             }
         }
     } else if (sourceName == QString("cpu/system/TotalLoad")) {
@@ -415,8 +415,7 @@ bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
             AWActions::sendNotification(QString("event"), i18n("High CPU load"), enablePopup);
         // value
         values[QString("cpu")] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1);
-        if (toolTip != nullptr) toolTip->setData(QString("cpuTooltip"),
-                                                 data[QString("value")].toFloat());
+        toolTip->setData(QString("cpuTooltip"), data[QString("value")].toFloat());
     } else if (sourceName.contains(cpuRegExp)) {
         // cpus
         QString number = sourceName;
@@ -425,8 +424,7 @@ bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
     } else if (sourceName == QString("cpu/system/AverageClock")) {
         // cpucl
         values[QString("cpucl")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
-        if (toolTip != nullptr) toolTip->setData(QString("cpuclTooltip"),
-                                                 data[QString("value")].toFloat());
+        toolTip->setData(QString("cpuclTooltip"), data[QString("value")].toFloat());
     } else if (sourceName.contains(cpuclRegExp)) {
         // cpucls
         QString number = sourceName;
@@ -545,8 +543,7 @@ bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
             AWActions::sendNotification(QString("event"), i18n("High memory usage"), enablePopup);
         // value
         values[QString("mem")] = QString("%1").arg(value, 5, 'f', 1);
-        if (toolTip != nullptr) toolTip->setData(QString("memTooltip"),
-                                                 values[QString("mem")].toFloat());
+        toolTip->setData(QString("memTooltip"), values[QString("mem")].toFloat());
     } else if (sourceName == QString("netdev")) {
         // network device
         // notification
@@ -568,8 +565,7 @@ bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
         }
         if (device == values[QString("netdev")]) {
             values[QString("down")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
-            if (toolTip != nullptr) toolTip->setData(QString("downTooltip"),
-                                                     data[QString("value")].toFloat());
+            toolTip->setData(QString("downTooltip"), data[QString("value")].toFloat());
         }
     } else if (sourceName.contains(netTransRegExp)) {
         // upload speed
@@ -583,8 +579,7 @@ bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
         }
         if (device == values[QString("netdev")]) {
             values[QString("up")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
-            if (toolTip != nullptr) toolTip->setData(QString("upTooltip"),
-                                                     data[QString("value")].toFloat());
+            toolTip->setData(QString("upTooltip"), data[QString("value")].toFloat());
         }
     } else if (sourceName == QString("pkg")) {
         // package manager
@@ -626,8 +621,7 @@ bool AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
             AWActions::sendNotification(QString("event"), i18n("Swap is used"), enablePopup);
         // value
         values[QString("swap")] = QString("%1").arg(value, 5, 'f', 1);
-        if (toolTip != nullptr) toolTip->setData(QString("swapTooltip"),
-                                                 values[QString("swap")].toFloat());
+        toolTip->setData(QString("swapTooltip"), values[QString("swap")].toFloat());
     } else if (sourceName.contains(tempRegExp)) {
         // temperature devices
         if (data[QString("units")].toString() == QString("rpm")) {
diff --git a/sources/extsysmon/extquotes.h b/sources/extsysmon/extquotes.h
index 7f16e92..13fade2 100644
--- a/sources/extsysmon/extquotes.h
+++ b/sources/extsysmon/extquotes.h
@@ -36,7 +36,7 @@ public:
         QTimer::singleShot(timeout, this, SLOT(timeout()));
     }
 
-private slots:
+public slots:
     void timeout()
     {
         QNetworkReply *reply = static_cast<QNetworkReply *>(parent());
diff --git a/sources/extsysmon/quotes/aapl.desktop b/sources/extsysmon/quotes/aapl.desktop
index f0bffdc..42b7c5f 100644
--- a/sources/extsysmon/quotes/aapl.desktop
+++ b/sources/extsysmon/quotes/aapl.desktop
@@ -4,6 +4,6 @@ Name=AAPL.NASDAQ
 Comment=Apple Inc
 X-AW-Ticker="AAPL"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=0
diff --git a/sources/extsysmon/quotes/eurrub.desktop b/sources/extsysmon/quotes/eurrub.desktop
index 87552f5..e766ec7 100644
--- a/sources/extsysmon/quotes/eurrub.desktop
+++ b/sources/extsysmon/quotes/eurrub.desktop
@@ -4,6 +4,6 @@ Name=EUR/RUB
 Comment=EUR/RUB
 X-AW-Ticker="EURRUB=X"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=1
diff --git a/sources/extsysmon/quotes/eurusd.desktop b/sources/extsysmon/quotes/eurusd.desktop
index 0a55014..1d4c51f 100644
--- a/sources/extsysmon/quotes/eurusd.desktop
+++ b/sources/extsysmon/quotes/eurusd.desktop
@@ -4,6 +4,6 @@ Name=EUR/USD
 Comment=EUR/USD
 X-AW-Ticker="EURUSD=X"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=2
diff --git a/sources/extsysmon/quotes/goog.desktop b/sources/extsysmon/quotes/goog.desktop
index 8b4970e..d7c92c2 100644
--- a/sources/extsysmon/quotes/goog.desktop
+++ b/sources/extsysmon/quotes/goog.desktop
@@ -4,6 +4,6 @@ Name=GOOG.NASDAQ
 Comment=Google Inc
 X-AW-Ticker="GOOG"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=3
diff --git a/sources/extsysmon/quotes/msft.desktop b/sources/extsysmon/quotes/msft.desktop
index 691d557..7ed5a5f 100644
--- a/sources/extsysmon/quotes/msft.desktop
+++ b/sources/extsysmon/quotes/msft.desktop
@@ -4,6 +4,6 @@ Name=MSFT.NASDAQ
 Comment=Microsoft Corp
 X-AW-Ticker="MSFT"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=4
diff --git a/sources/extsysmon/quotes/rts.desktop b/sources/extsysmon/quotes/rts.desktop
index 6694e48..6db5197 100644
--- a/sources/extsysmon/quotes/rts.desktop
+++ b/sources/extsysmon/quotes/rts.desktop
@@ -4,6 +4,6 @@ Name=RTS
 Comment=RTS Index
 X-AW-Ticker="RTS.RS"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=5
diff --git a/sources/extsysmon/quotes/snp.desktop b/sources/extsysmon/quotes/snp.desktop
index ecc8586..fe41d43 100644
--- a/sources/extsysmon/quotes/snp.desktop
+++ b/sources/extsysmon/quotes/snp.desktop
@@ -4,6 +4,6 @@ Name=S&P
 Comment=S&P 500 Index
 X-AW-Ticker="^GSPC"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=6
diff --git a/sources/extsysmon/quotes/usdrub.desktop b/sources/extsysmon/quotes/usdrub.desktop
index a4bfd28..673fade 100644
--- a/sources/extsysmon/quotes/usdrub.desktop
+++ b/sources/extsysmon/quotes/usdrub.desktop
@@ -4,6 +4,6 @@ Name=USD/RUB
 Comment=USD/RUB
 X-AW-Ticker="USDRUB=X"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=8
diff --git a/sources/extsysmon/quotes/vix.desktop b/sources/extsysmon/quotes/vix.desktop
index f5cd5f0..76e9d58 100644
--- a/sources/extsysmon/quotes/vix.desktop
+++ b/sources/extsysmon/quotes/vix.desktop
@@ -4,6 +4,6 @@ Name=VIX
 Comment=Volatility S&P 500
 X-AW-Ticker="^VIX"
 X-AW-Active=false
-X-AW-ApiVersion=1
+X-AW-ApiVersion=2
 X-AW-Interval=60
 X-AW-Number=7
diff --git a/sources/extsysmon/scripts/awesomewidgets-extscripts-filters.json b/sources/extsysmon/scripts/awesomewidgets-extscripts-filters.json
index c5d9426..68b5782 100644
--- a/sources/extsysmon/scripts/awesomewidgets-extscripts-filters.json
+++ b/sources/extsysmon/scripts/awesomewidgets-extscripts-filters.json
@@ -20,7 +20,9 @@
     },
     "newline": {
         "\n": "<br>",
-        "\t": "&#09;"
+        "\n\r": "<br>",
+        "\t": "&#09;",
+        "\v": "&#11;"
     },
     "space": {
         " ": "&nbsp;"