diff --git a/public/src/variables.js b/public/src/variables.js
index 6b443caa5d..9f303852c3 100644
--- a/public/src/variables.js
+++ b/public/src/variables.js
@@ -6,10 +6,9 @@
 	ajaxify.variables = {};
 
 	ajaxify.variables.parse = function() {
-		var dataEl = $('#content [ajaxify-data]');
+		var dataEl = $('#content #ajaxify-data');
 		if (dataEl.length) {
-			ajaxify.data = JSON.parse(decodeURIComponent(dataEl.attr('ajaxify-data')));
-			dataEl.remove();
+			ajaxify.data = JSON.parse(dataEl.text());
 		}
 	};
 }(ajaxify || {}));
diff --git a/src/middleware/render.js b/src/middleware/render.js
index 4cf5567ae8..eecfe4d55c 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -45,13 +45,15 @@ module.exports = function(middleware) {
 				fn = defaultFn;
 			}
 
-			var ajaxifyData = encodeURIComponent(JSON.stringify(options));
+			var ajaxifyData = JSON.stringify(options);
+			
 			render.call(self, template, options, function(err, str) {
 				if (err) {
 					return fn(err);
 				}
+								
+				str = str + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
 
-				str = str + '<input type="hidden" ajaxify-data="' + ajaxifyData + '" />';
 				str = (res.locals.postHeader ? res.locals.postHeader : '') + str + (res.locals.preFooter ? res.locals.preFooter : '');
 
 				if (res.locals.footer) {