diff --git a/src/GSvarServer/ServerController.cpp b/src/GSvarServer/ServerController.cpp
index 0f3e85867..a02e9884a 100644
--- a/src/GSvarServer/ServerController.cpp
+++ b/src/GSvarServer/ServerController.cpp
@@ -297,22 +297,20 @@ HttpResponse ServerController::locateFileByType(const HttpRequest& request)
 
         QJsonArray cached_array = cache_doc.array();
         Log::error("cached_array.count() = " + QString::number(cached_array.count()));
-        for (int i=0; i<cached_array.count();++i)
+        for (const QJsonValue &value : cached_array)
         {
-            Log::error(QString::number(i));
-            Log::error(cached_array.at(i).toObject()["filename"].toString());
-            if (cached_array.at(i).isObject())
+            if (value.isObject())
             {
-                Log::error(QString::number(i) + " is object");
+                QJsonObject obj = value.toObject();
                 QJsonObject cached_object = cached_array.takeAt(i).toObject();
-                QString cached_filename = cached_object["filename"].toString();
+                QString cached_filename = obj.value["filename"].toString();
                 Log::error("cached_filename = " + cached_filename);
 
                 if (!cached_filename.isEmpty())
-                {                    
+                {
                     cached_object.insert("filename", createTempUrl(cached_filename, request.getUrlParams()["token"]));
                     updated_cached_array.append(cached_object);
-                }               
+                }
             }
         }
 
diff --git a/src/cppREST/ServerDB.cpp b/src/cppREST/ServerDB.cpp
index a8c244330..da176d5f8 100644
--- a/src/cppREST/ServerDB.cpp
+++ b/src/cppREST/ServerDB.cpp
@@ -518,7 +518,7 @@ QJsonDocument ServerDB::getFileLocation(const QString filename_with_path, const
         Log::error("-----------");
         Log::error(query.value(index_json_content).toString());
         Log::error("-----------");
-        return QJsonDocument::fromJson(query.value(index_json_content).toString().toLocal8Bit());
+        return QJsonDocument::fromJson(query.value(index_json_content).toString().toUtf8());
     }
     return QJsonDocument();
 }