diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/client/bootstrap/module-internal.js b/js/apps/system/_admin/aardvark/APP/frontend/js/client/bootstrap/module-internal.js
index a8f72d6a16..cf2f56c6ce 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/client/bootstrap/module-internal.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/client/bootstrap/module-internal.js
@@ -159,13 +159,15 @@ exports.executeServer = function (body) {
 /// @brief logs a request in curl format
 ////////////////////////////////////////////////////////////////////////////////
 
-exports.appendCurlRequest = function (appender) {
+exports.appendCurlRequest = function (shellAppender,jsonAppender, rawAppender) {
   return function (method, url, body, headers) {
     var response;
     var curl;
     var i;
+    var jsonBody = false;
 
     if ((typeof body !== 'string') && (body !== undefined)) {
+      jsonBody = true;
       body = exports.inspect(body);
     }
 
@@ -212,14 +214,19 @@ exports.appendCurlRequest = function (appender) {
 
     curl += "--dump - http://localhost:8529" + url;
 
-    appender(curl);
+    shellAppender(curl);
 
     if (body !== undefined && body !== "" && body) {
-      appender(" <<EOF\n");
-      appender(body);
-      appender("\nEOF");
+      rawAppender(" &lt;&lt;EOF\n");
+      if (jsonBody) {
+        jsonAppender(body);
+      }
+      else {
+        rawAppender(body);
+      }
+      rawAppender("\nEOF");
     }
-    appender("\n\n");
+    rawAppender("\n\n");
     return response;
   };
 };
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection-common.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection-common.js
index 9f81df907f..269e369a13 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection-common.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/arango-collection-common.js
@@ -696,7 +696,12 @@ ArangoCollection.prototype.geo = function(loc, order) {
 /// @EXAMPLE_ARANGOSH_OUTPUT{007_collectionNear}
 /// ~ db._create("geo");
 ///   db.geo.ensureGeoIndex("loc");
-///   for (var i = -90;  i <= 90;  i += 10) { for (var j = -180; j <= 180; j += 10) { db.geo.save({ name : "Name/" + i + "/" + j, loc: [ i, j ] }); } }
+///   |for (var i = -90;  i <= 90;  i += 10) { 
+///   |   for (var j = -180; j <= 180; j += 10) {
+///   |     db.geo.save({
+///   |        name : "Name/" + i + "/" + j,
+///   |        loc: [ i, j ] });
+///   } }
 ///   db.geo.near(0, 0).limit(2).toArray();
 /// ~ db._drop("geo");
 /// @END_EXAMPLE_ARANGOSH_OUTPUT
@@ -707,7 +712,12 @@ ArangoCollection.prototype.geo = function(loc, order) {
 /// @EXAMPLE_ARANGOSH_OUTPUT{008_collectionNearDistance}
 /// ~ db._create("geo");
 ///   db.geo.ensureGeoIndex("loc");
-///   for (var i = -90;  i <= 90;  i += 10) { for (var j = -180; j <= 180; j += 10) { db.geo.save({ name : "Name/" + i + "/" + j, loc: [ i, j ] }); } }
+///   |for (var i = -90;  i <= 90;  i += 10) {
+///   |  for (var j = -180; j <= 180; j += 10) {
+///   |     db.geo.save({
+///   |         name : "Name/" + i + "/" + j,
+///   |         loc: [ i, j ] });
+///   } }
 ///   db.geo.near(0, 0).distance().limit(2).toArray();
 /// ~ db._drop("geo");
 /// @END_EXAMPLE_ARANGOSH_OUTPUT
@@ -759,7 +769,9 @@ ArangoCollection.prototype.near = function (lat, lon) {
 /// @EXAMPLE_ARANGOSH_OUTPUT{009_collectionWithin}
 /// ~ db._create("geo");
 /// ~ db.geo.ensureGeoIndex("loc");
-/// ~ for (var i = -90;  i <= 90;  i += 10) { for (var j = -180; j <= 180; j += 10) { db.geo.save({ name : "Name/" + i + "/" + j, loc: [ i, j ] }); } }
+/// |~ for (var i = -90;  i <= 90;  i += 10) {
+/// |  for (var j = -180; j <= 180; j += 10) {
+///       db.geo.save({ name : "Name/" + i + "/" + j, loc: [ i, j ] }); } }
 ///   db.geo.within(0, 0, 2000 * 1000).distance().toArray();
 /// ~ db._drop("geo");
 /// @END_EXAMPLE_ARANGOSH_OUTPUT