diff --git a/Documentation/Books/Users/Transactions/TransactionInvocation.mdpp b/Documentation/Books/Users/Transactions/TransactionInvocation.mdpp
index e74de14ac3..8022e7af0e 100644
--- a/Documentation/Books/Users/Transactions/TransactionInvocation.mdpp
+++ b/Documentation/Books/Users/Transactions/TransactionInvocation.mdpp
@@ -263,7 +263,7 @@ db.c1.save({ _key: "key2" });
 db.c1.save({ _key: "key3" });
 
 // this will push out key1 
-// we now have these keys: [ "key1", "key2", "key3" ] 
+// we now have these keys: [ "key2", "key3", "key4" ] 
 db.c1.save({ _key: "key4" });
 
 
@@ -336,4 +336,4 @@ db._executeTransaction({
 
 db.c1.count(); // 0 
 db.c2.count(); // 0 
-```
\ No newline at end of file
+```
diff --git a/js/apps/system/aardvark/frontend/src/mode-aql.js b/js/apps/system/aardvark/frontend/src/mode-aql.js
index 6da281d4b3..10414108b5 100644
--- a/js/apps/system/aardvark/frontend/src/mode-aql.js
+++ b/js/apps/system/aardvark/frontend/src/mode-aql.js
@@ -88,7 +88,7 @@ var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var AqlHighlightRules = function() {
 
     var keywords = (
-        "for|return|filter|sort|limit|let|collect|asc|desc|in|into|insert|update|remove|replace|options"
+        "for|return|filter|sort|limit|let|collect|asc|desc|in|into|insert|update|remove|replace|options|with"
     );
 
     var builtinFunctions = (
@@ -97,6 +97,17 @@ var AqlHighlightRules = function() {
         "like|floor|ceil|round|abs|sqrt|rand|length|min|max|average|sum|median|variance_population|" +
         "variance_sample|first|last|unique|matches|merge|merge_recursive|has|attributes|unset|keep|" +
         "near|within|fulltext|paths|traversal|traversal_tree|edges|not_null|first_list|first_document|" +
+        "flatten|length|min|max|sum|median|average|variance_sample|variance_population|"+
+        "stddev_sample|stddev_population|unique|slice|reverse|first|last|nth|position|"+
+        "has|attributes|merge|merge_recursive|document|matches|unset|keep|translate|"+
+        "near|within|fulltext|paths|graph_paths|shortest_path|graph_shortest_path|graph_distance_to|"+
+        "traversal|graph_traversal|traversal_tree|graph_traversal_tree|edges|graph_edges|"+
+        "graph_vertices|neighbors|graph_neighbors|graph_common_neighbors|graph_common_properties|"+
+        "graph_eccentricity|graph_betweenness|graph_closeness|graph_absolute_eccentricity|"+
+        "graph_absolute_betweenness|graph_absolute_closeness|graph_diameter|graph_radius|date_now|"+
+        "date_timestamp|date_iso8601|date_dayofweek|date_year|date_month|date_day|date_hour|"+
+        "date_minute|date_second|date_millisecond|fail|passthru|sleep|collections|not_null|"+
+        "first_list|first_document|parse_identifier|skiplist|current_user|current_database|"+
         "collections|document|stddev_population|stddev_sample|neighbors|union|union_distinct|intersection)"
     );
 
diff --git a/js/apps/system/aardvark/test/specs/views/dbSelectionViewSpec.js b/js/apps/system/aardvark/test/specs/views/dbSelectionViewSpec.js
index ce7bb7c37d..3baa4e4644 100644
--- a/js/apps/system/aardvark/test/specs/views/dbSelectionViewSpec.js
+++ b/js/apps/system/aardvark/test/specs/views/dbSelectionViewSpec.js
@@ -54,7 +54,7 @@
 
             expect(div.childElementCount).toEqual(2);
             childs = $(dbList).children();
-            expect(childs.length).toEqual(3);
+            expect(childs.length).toEqual(4);
 
             expect($("a", $(childs[1])).attr("id")).toEqual(list[0]);
             expect($("a", $(childs[2])).attr("id")).toEqual(list[1]);