diff --git a/src/librssguard/network-web/apiserver.cpp b/src/librssguard/network-web/apiserver.cpp
index 90037fc51..ccc0478e1 100644
--- a/src/librssguard/network-web/apiserver.cpp
+++ b/src/librssguard/network-web/apiserver.cpp
@@ -8,6 +8,7 @@
 #include "miscellaneous/application.h"
 
 #include <QJsonArray>
+#include <QMetaEnum>
 
 ApiServer::ApiServer(QObject* parent) : HttpServer(parent) {}
 
@@ -53,7 +54,9 @@ void ApiServer::answerClient(QTcpSocket* socket, const HttpRequest& request) {
 
     reply_message += json_data;
 
+#if !defined(NDEBUG)
     IOFactory::writeFile("a.out", json_data);
+#endif
   }
 
   socket->write(reply_message);
@@ -115,12 +118,26 @@ ApiResponse ApiServer::processUnknown() const {
   return ApiResponse(ApiResponse::Result::Error, ApiRequest::Method::Unknown, QSL("unknown method"));
 }
 
+ApiResponse::ApiResponse(Result result, ApiRequest::Method method, const QJsonValue& response)
+  : m_result(result), m_method(method), m_response(response) {}
+
 QJsonDocument ApiResponse::toJson() const {
   QJsonObject obj;
 
-  obj.insert("method", int(m_method));
-  obj.insert("result", int(m_result));
-  obj.insert("data", m_response);
+  static QMetaEnum enumer_method = QMetaEnum::fromType<ApiRequest::Method>();
+  static QMetaEnum enumer_result = QMetaEnum::fromType<ApiResponse::Result>();
+
+  obj.insert(QSL("method"), enumer_method.valueToKey(int(m_method)));
+  obj.insert(QSL("result"), enumer_result.valueToKey(int(m_result)));
+  obj.insert(QSL("data"), m_response);
 
   return QJsonDocument(obj);
 }
+
+ApiRequest::ApiRequest(const QJsonDocument& data) : m_method(), m_parameters(data.object().value(QSL("data"))) {
+  static QMetaEnum enumer = QMetaEnum::fromType<ApiRequest::Method>();
+
+  QByteArray method_name = data.object().value(QSL("method")).toString().toLocal8Bit();
+
+  m_method = Method(enumer.keysToValue(method_name.constData()));
+}
diff --git a/src/librssguard/network-web/apiserver.h b/src/librssguard/network-web/apiserver.h
index 66fcb75ba..47b13b5ca 100644
--- a/src/librssguard/network-web/apiserver.h
+++ b/src/librssguard/network-web/apiserver.h
@@ -9,6 +9,8 @@
 #include <QJsonObject>
 
 struct ApiRequest {
+    Q_GADGET
+
   public:
     enum class Method {
       Unknown = 0,
@@ -16,22 +18,26 @@ struct ApiRequest {
       ArticlesFromFeed = 2
     };
 
-    explicit ApiRequest(const QJsonDocument& data)
-      : m_method(Method(data.object().value("method").toInt())), m_parameters(data.object().value("data")) {}
+    Q_ENUM(Method)
+
+    explicit ApiRequest(const QJsonDocument& data);
 
     Method m_method;
     QJsonValue m_parameters;
 };
 
 struct ApiResponse {
+    Q_GADGET
+
   public:
     enum class Result {
       Success = 1,
       Error = 2
     };
 
-    explicit ApiResponse(Result result, ApiRequest::Method method, const QJsonValue& response)
-      : m_result(result), m_method(method), m_response(response) {}
+    Q_ENUM(Result)
+
+    explicit ApiResponse(Result result, ApiRequest::Method method, const QJsonValue& response);
 
     Result m_result;
     ApiRequest::Method m_method;