diff --git a/packages/composer-documentation/_template/assets.default/systemns-index.md b/packages/composer-documentation/_template/assets.default/systemns-index.md
index 6d9d27c046..d9e65bb266 100644
--- a/packages/composer-documentation/_template/assets.default/systemns-index.md
+++ b/packages/composer-documentation/_template/assets.default/systemns-index.md
@@ -56,3 +56,15 @@ The system namespace transactions are:
 - StartBusinessNetwork
 - ResetBusinessNetwork
 - SetLogLevel
+
+## Events
+
+The system namespace events are:
+
+- Event
+
+## Enumerations
+
+The system namespace enumerations are:
+
+- IdentityState
\ No newline at end of file
diff --git a/packages/composer-website/jekylldocs/_layouts/default.html b/packages/composer-website/jekylldocs/_layouts/default.html
index 4c26c1333f..6ac545246a 100644
--- a/packages/composer-website/jekylldocs/_layouts/default.html
+++ b/packages/composer-website/jekylldocs/_layouts/default.html
@@ -29,8 +29,6 @@
               <option>Select version</option>
               <option value="/composer/latest/introduction/introduction.html" title="The most stable version of Composer">Latest</option>
               <option value="/composer/unstable/introduction/introduction.html" title="The version that will replace Latest">Latest-unstable</option>
-              <option value="/composer/next/introduction/introduction.html" title="The most ready version of the next generation of Composer, new features (possibly breaking) and many fixes">Next</option>
-              <option value="/composer/next-unstable/introduction/introduction.html" title="The closest to the development stream of Composer, expect breaking changes">Next-unstable</option>
           </select>
 
             <div class="search-form">
diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/query/functiondef-recall-high-qty-commodities.png b/packages/composer-website/jekylldocs/assets/img/tutorials/query/functiondef-recall-high-qty-commodities.png
index dcc414d37f..96b662296a 100644
Binary files a/packages/composer-website/jekylldocs/assets/img/tutorials/query/functiondef-recall-high-qty-commodities.png and b/packages/composer-website/jekylldocs/assets/img/tutorials/query/functiondef-recall-high-qty-commodities.png differ
diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/query/querydef-recall-high-qty-commodities.png b/packages/composer-website/jekylldocs/assets/img/tutorials/query/querydef-recall-high-qty-commodities.png
index 2351647d16..be2fabe7fa 100644
Binary files a/packages/composer-website/jekylldocs/assets/img/tutorials/query/querydef-recall-high-qty-commodities.png and b/packages/composer-website/jekylldocs/assets/img/tutorials/query/querydef-recall-high-qty-commodities.png differ
diff --git a/packages/composer-website/jekylldocs/business-network/cloud-wallets.md b/packages/composer-website/jekylldocs/business-network/cloud-wallets.md
index 972020a39c..46ee8a0873 100644
--- a/packages/composer-website/jekylldocs/business-network/cloud-wallets.md
+++ b/packages/composer-website/jekylldocs/business-network/cloud-wallets.md
@@ -128,7 +128,6 @@ will use the file system card store at the location `/home/username/.composer`,
 To specify a custom wallet within the API, without the use of a globally exported value, it must be included as an option passed to the connection:
 
 ```javascript
-
         const connectionOptions = {
             wallet : {
                 type: 'composer-wallet-filesystem',
@@ -160,7 +159,11 @@ Previously to use the in MemoryCardStore, the code would have been written
 This has now changed and Card stores must now be specified differently:
 
 ```javascript
-        const NetworkCardStoreManager= require('composer-common').NetworkCardStoreManager;
-        const cardStore = NetworkCardStoreManager.getCardStore( { type: 'composer-wallet-inmemory' } );
-        let adminConnection = new AdminConnection({ cardStore });
+        const connectionOptions = {
+            wallet : {
+                type: 'composer-wallet-inmemory'
+            }
+        };
+        adminConnection = new AdminConnection(connectionOptions);
+        clientConnection = new BusinessNetworkConnection(connectionOptions);
 ```
diff --git a/packages/composer-website/jekylldocs/business-network/query.md b/packages/composer-website/jekylldocs/business-network/query.md
index 538cde5dd2..e18c5d6b11 100644
--- a/packages/composer-website/jekylldocs/business-network/query.md
+++ b/packages/composer-website/jekylldocs/business-network/query.md
@@ -51,7 +51,7 @@ query Q18 {
     statement:
         SELECT org.acme.Driver
             WHERE (_$ageParam < age)
-                ORDER BY [lastName ASC, firstName DESC]
+                ORDER BY [lastName DESC, firstName DESC]
                     LIMIT _$limitParam
                         SKIP _$skipParam
 }
diff --git a/packages/composer-website/jekylldocs/reference/query-language.md b/packages/composer-website/jekylldocs/reference/query-language.md
index 435f6d1ff8..16a29577f3 100644
--- a/packages/composer-website/jekylldocs/reference/query-language.md
+++ b/packages/composer-website/jekylldocs/reference/query-language.md
@@ -39,7 +39,7 @@ The `statement` property contains the defining rules of the query, and can have
 
 This query returns all drivers from the default registry whose age is less than the supplied parameter _or_ whose firstName is "Dan", as long as their lastName is not "Selman".
 
-In practical terms, this query returns all drivers who do not have the lastName "Selman", as long as they are under a defined age, or have the firstName Dan, and orders the results by lastName ascending and firstName descending.
+In practical terms, this query returns all drivers who do not have the lastName "Selman", as long as they are under a defined age, or have the firstName Dan, and orders the results by lastName ascending and firstName ascending.
 
 ```
 query Q20{