diff --git a/src/main/java/org/qortal/api/HTMLParser.java b/src/main/java/org/qortal/api/HTMLParser.java
index 86f0c19e..9e7bb2d2 100644
--- a/src/main/java/org/qortal/api/HTMLParser.java
+++ b/src/main/java/org/qortal/api/HTMLParser.java
@@ -41,8 +41,12 @@ public class HTMLParser {
             String qAppsScriptElement = String.format("<script src=\"/apps/q-apps.js?time=%d\">", System.currentTimeMillis());
             head.get(0).prepend(qAppsScriptElement);
 
-            // Add vars
-            String qdnContextVar = String.format("<script>var qdnContext=\"%s\"; var qdnService=\"%s\"; var qdnName=\"%s\"; var qdnIdentifier=\"%s\"; var qdnPath=\"%s\";</script>", this.qdnContext, this.service.toString(), this.resourceId, this.identifier, this.path);
+            // Escape and add vars
+            String service = this.service.toString().replace("\"","\\\"");
+            String name = this.resourceId != null ? this.resourceId.replace("\"","\\\"") : "";
+            String identifier = this.identifier != null ? this.identifier.replace("\"","\\\"") : "";
+            String path = this.path != null ? this.path.replace("\"","\\\"") : "";
+            String qdnContextVar = String.format("<script>var _qdnContext=\"%s\"; var _qdnService=\"%s\"; var _qdnName=\"%s\"; var _qdnIdentifier=\"%s\"; var _qdnPath=\"%s\";</script>", this.qdnContext, service, name, identifier, path);
             head.get(0).prepend(qdnContextVar);
 
             // Add base href tag
diff --git a/src/main/resources/q-apps/q-apps.js b/src/main/resources/q-apps/q-apps.js
index 88be3d37..7abf4787 100644
--- a/src/main/resources/q-apps/q-apps.js
+++ b/src/main/resources/q-apps/q-apps.js
@@ -40,12 +40,12 @@ function handleResponse(event, response) {
 }
 
 function buildResourceUrl(service, name, identifier, path) {
-    if (qdnContext == "render") {
+    if (_qdnContext == "render") {
         url = "/render/" + service + "/" + name;
         if (path != null) url = url.concat((path.startsWith("/") ? "" : "/") + path);
         if (identifier != null) url = url.concat("?identifier=" + identifier);
     }
-    else if (qdnContext == "gateway") {
+    else if (_qdnContext == "gateway") {
         url = "/" + service + "/" + name;
         if (identifier != null) url = url.concat("/" + identifier);
         if (path != null) url = url.concat((path.startsWith("/") ? "" : "/") + path);
@@ -329,10 +329,10 @@ else if (document.attachEvent) {
 document.addEventListener('DOMContentLoaded', () => {
     qortalRequest({
         action: "QDN_RESOURCE_DISPLAYED",
-        service: qdnService,
-        name: qdnName,
-        identifier: qdnIdentifier,
-        path: qdnPath
+        service: _qdnService,
+        name: _qdnName,
+        identifier: _qdnIdentifier,
+        path: _qdnPath
     });
 });