diff --git a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp
index ee4f8245..bafd9ac4 100644
--- a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp
@@ -28,8 +28,14 @@ void ReadingListContentControllerV2::serviceContent(const int &library, const qu
 {
     QList<ComicDB> comics = DBHelper::getReadingListFullContent(library, readingListId);
 
+    QJsonArray items;
+
     for(const ComicDB &comic : comics)
     {
-        response.write(YACReaderServerDataHelper::comicToYSFormat(library, comic).toUtf8());
+        items.append(YACReaderServerDataHelper::comicToJSON(library, comic));
     }
+
+    QJsonDocument output(items);
+
+    response.write(output.toJson());
 }
diff --git a/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp
index 24142ff7..271e6df5 100644
--- a/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp
@@ -2,6 +2,9 @@
 
 #include "db_helper.h"
 #include "reading_list.h"
+#include "yacreader_server_data_helper.h"
+
+
 
 ReadingListsControllerV2::ReadingListsControllerV2()
 {
@@ -25,8 +28,14 @@ void ReadingListsControllerV2::serviceContent(const int library, HttpResponse &r
 {
     QList<ReadingList> readingLists = DBHelper::getReadingLists(library);
 
-    foreach(const ReadingList &item, readingLists)
+    QJsonArray items;
+
+    for(QList<ReadingList>::const_iterator itr = readingLists.constBegin();itr!=readingLists.constEnd();itr++)
     {
-        response.write(QString("%1\t%2\t%3\r\n").arg(library).arg(item.getId()).arg(item.getName()).toUtf8());
+        items.append(YACReaderServerDataHelper::readingListToJSON(library, *itr));
     }
+
+    QJsonDocument output(items);
+
+    response.write(output.toJson());
 }
diff --git a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp
index 6584bbad..ad0863ba 100644
--- a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp
@@ -7,6 +7,8 @@
 #include "../static.h"
 #include "yacreader_global.h"
 
+#include "yacreader_server_data_helper.h"
+
 #include "QsLog.h"
 
 TagsControllerV2::TagsControllerV2() {}
@@ -19,12 +21,16 @@ void TagsControllerV2::service(HttpRequest& request, HttpResponse& response)
     QStringList pathElements = path.split('/');
     int libraryId = pathElements.at(3).toInt();
 
-    QList<Label> tags = DBHelper::getLabels(libraryId);
+    QList<Label> labels = DBHelper::getLabels(libraryId);
 
-    foreach(const Label &tag, tags)
+    QJsonArray items;
+
+    for(QList<Label>::const_iterator itr = labels.constBegin();itr!=labels.constEnd();itr++)
     {
-        response.write(QString("%1\t%2\t%3\t%4\r\n").arg(libraryId).arg(tag.getId()).arg(tag.getName()).arg(labelColorToRGBString(tag.getColorID())).toUtf8());
+        items.append(YACReaderServerDataHelper::labelToJSON(libraryId, *itr));
     }
 
-    response.write("",true);
+    QJsonDocument output(items);
+
+    response.write(output.toJson());;
 }