diff --git a/public/webconsole.js b/public/webconsole.js
index 55ed479..8f98372 100644
--- a/public/webconsole.js
+++ b/public/webconsole.js
@@ -1,35 +1,17 @@
-$(document).ready(function() {
-  $("#rack-webconsole").hide();
-  $(this).keypress(function(event) {
-    if (event.which == 96) {
-      $("#rack-webconsole").slideToggle('fast', function() {
-        if ($(this).is(':visible')) {
-          $("#rack-webconsole form input").focus();
-          $("#rack-webconsole .results_wrapper").scrollTop(
-            $("#rack-webconsole .results").height()
-            );
-        } else {
-          $("#rack-webconsole form input").blur();
-        }
-      });
-      event.preventDefault();
-    }
-  });
-});
 $('#rack-webconsole form').submit(function(e){
-    e.preventDefault();
+  e.preventDefault();
 });
-String.prototype.escapeHTML = function () {
-    return(
-        this.replace(/&/g,'&').
-            replace(/>/g,'>').
-            replace(/</g,'&lt;').
-            replace(/"/g,'&quot;')
-    );
-};
 
 $("#rack-webconsole form input").keyup(function(event) {
-  if(event.which == 13) {
+  function escapeHTML(string) {
+    return(string.replace(/&/g,'&amp;').
+      replace(/>/g,'&gt;').
+      replace(/</g,'&lt;').
+      replace(/"/g,'&quot;')
+    );
+  };
+
+  if (event.which == 13) {
     /*$.post('/webconsole', $("#rack-webconsole form").serialize());*/
     var query = $("#query").val();
     $.ajax({
@@ -38,14 +20,34 @@ $("#rack-webconsole form input").keyup(function(event) {
       dataType: 'json',
       data: ({query: query, token: "TOKEN"}),
       success: function (data) {
-        var q = "<div class='query'>>> " + query.escapeHTML() + "</div>";
-        var r = "<div class='result'>=> " + data.result.escapeHTML() + "</div>";
+        var q = "<div class='query'>" + escapeHTML(">> " + query) + "</div>";
+        var r = "<div class='result'>" + escapeHTML("=> " + data.result) + "</div>";
         $("#rack-webconsole .results").append(q + r);
         $("#rack-webconsole .results_wrapper").scrollTop(
           $("#rack-webconsole .results").height()
-          );
+        );
         $("#query").val('');
       }
     });
   }
 });
+
+$(document).ready(function() {
+  $("#rack-webconsole").hide();
+  $(this).keypress(function(event) {
+    if (event.which == 96) {
+      $("#rack-webconsole").slideToggle('fast', function() {
+        if ($(this).is(':visible')) {
+          $("#rack-webconsole form input").focus();
+          $("#rack-webconsole .results_wrapper").scrollTop(
+            $("#rack-webconsole .results").height()
+          );
+        } else {
+          $("#rack-webconsole form input").blur();
+        }
+      });
+      event.preventDefault();
+    }
+  });
+});
+