diff --git a/docs/gettingstarted/broadcast_data.md b/docs/gettingstarted/broadcast_data.md
index 42898012bb..5982805718 100644
--- a/docs/gettingstarted/broadcast_data.md
+++ b/docs/gettingstarted/broadcast_data.md
@@ -33,8 +33,8 @@ nav_order: 4
 
 ## Additional info
 
-- Key Concepts: [Broadcast / shared data](/keyconcepts/broadcast.html)
-- Swagger: [POST /api/v1/namespaces/{ns}/broadcast/message](/swagger/swagger.html#/default/postBroadcastMessage)
+- Key Concepts: [Broadcast / shared data](/firefly/keyconcepts/broadcast.html)
+- Swagger: [POST /api/v1/namespaces/{ns}/broadcast/message](/firefly/swagger/swagger.html#/default/postBroadcastMessage)
 
 ## Example 1: Inline string data
 
diff --git a/docs/gettingstarted/custom_blockchain.md b/docs/gettingstarted/custom_blockchain.md
index 9ac81309cd..ed1e392acb 100644
--- a/docs/gettingstarted/custom_blockchain.md
+++ b/docs/gettingstarted/custom_blockchain.md
@@ -24,4 +24,4 @@ those transactions in your application, are currently under development.
 You can access the APIs of the blockchain interface plugins directly, which perform the heavy lifting
 to add an API/Event gateway in front of the low level blockchain RPC interfaces.
 
-See [Key Concepts: Blockchain protocols](/keyconcepts/blockchain_protocols.html) for more information.
+See [Key Concepts: Blockchain protocols](/firefly/keyconcepts/blockchain_protocols.html) for more information.
diff --git a/docs/gettingstarted/define_datatype.md b/docs/gettingstarted/define_datatype.md
index 0c86decada..aedcc6c9e8 100644
--- a/docs/gettingstarted/define_datatype.md
+++ b/docs/gettingstarted/define_datatype.md
@@ -31,8 +31,8 @@ of datatypes, as is used to broadcast the data itself.
 
 ## Additional info
 
-- Key Concepts: [Broadcast / shared data](/keyconcepts/broadcast.html)
-- Swagger: [POST /api/v1/namespaces/{ns}/broadcast/datatype](/swagger/swagger.html#/default/postBroadcastDatatype)
+- Key Concepts: [Broadcast / shared data](/firefly/keyconcepts/broadcast.html)
+- Swagger: [POST /api/v1/namespaces/{ns}/broadcast/datatype](/firefly/swagger/swagger.html#/default/postBroadcastDatatype)
 
 ### Example 1: Broadcast new datatype
 
diff --git a/docs/gettingstarted/events.md b/docs/gettingstarted/events.md
index 33b5246934..ada3b30634 100644
--- a/docs/gettingstarted/events.md
+++ b/docs/gettingstarted/events.md
@@ -36,7 +36,7 @@ We focus on WebSockets in this getting started guide.
 
 ## Additional info
 
-- Key Concepts: [Multi-party process flow](/keyconcepts/multiparty_process_flow.html)
+- Key Concepts: [Multi-party process flow](/firefly/keyconcepts/multiparty_process_flow.html)
 - Reference: _coming soon_
 
 ## WebSockets Example 1: Ephemeral subscription with auto-commit
diff --git a/docs/gettingstarted/private_send.md b/docs/gettingstarted/private_send.md
index 41da3baafa..a0873e1e45 100644
--- a/docs/gettingstarted/private_send.md
+++ b/docs/gettingstarted/private_send.md
@@ -48,8 +48,8 @@ nav_order: 4
 
 ## Additional info
 
-- Key Concepts: [Private data exchange](/keyconcepts/data_exchange.html)
-- Swagger: [POST /api/v1/namespaces/{ns}/send/message](/swagger/swagger.html#/default/postSendMessage)
+- Key Concepts: [Private data exchange](/firefly/keyconcepts/data_exchange.html)
+- Swagger: [POST /api/v1/namespaces/{ns}/send/message](/firefly/swagger/swagger.html#/default/postSendMessage)
 
 ## Example 1: Pinned private send of in-line string data
 
@@ -225,7 +225,7 @@ and pipe it into a multi-part form post to FireFly.
 ```sh
 curl -sLo - https://github.com/hyperledger/firefly/raw/main/docs/firefly_logo.png \
  | curl --form autometa=true --form file=@- \
-   http://localhost:5000/api/v1/api/v1/namespaces/default/data
+   http://localhost:5000/api/v1/namespaces/default/data
 ```
 
 ### Example data response from BLOB upload
@@ -267,6 +267,13 @@ Just include a reference to the `id` returned from the upload.
     {
       "id": "97eb750f-0d0b-4c1d-9e37-1e92d1a22bb8"
     }
-  ]
+  ],
+  "group":{
+      "members": [
+        {
+          "identity":"org_1"
+        }
+      ]
+    }
 }
 ```
diff --git a/docs/gettingstarted/query_messages.md b/docs/gettingstarted/query_messages.md
index 40b989165d..19a50f7a24 100644
--- a/docs/gettingstarted/query_messages.md
+++ b/docs/gettingstarted/query_messages.md
@@ -28,8 +28,8 @@ This builds on the APIs to query and filter messages, described below
 
 ## Additional info
 
-- Reference: [API Query Syntax](/reference/api_query_syntax.html)
-- Swagger: [GET /api/v1/namespaces/{ns}/messages](/swagger/swagger.html#/default/getMsgs)
+- Reference: [API Query Syntax](/firefly/reference/api_query_syntax.html)
+- Swagger: [GET /api/v1/namespaces/{ns}/messages](/firefly/swagger/swagger.html#/default/getMsgs)
 
 ### Example 1: Query confirmed messages
 
diff --git a/docs/keyconcepts/data_exchange.md b/docs/keyconcepts/data_exchange.md
index aee295a700..a812647f22 100644
--- a/docs/keyconcepts/data_exchange.md
+++ b/docs/keyconcepts/data_exchange.md
@@ -46,7 +46,7 @@ characteristics that differ between different implementations.
   - There are many technologies including Mutual TLS, and Java Web Tokens (JWT),
     that can be used to ensure a private data exchange is happening with the
     correct party in the system.
-  - Most modern approaches us public/private key encryption to establish the identity
+  - Most modern approaches use public/private key encryption to establish the identity
     during the setup phase of a connection. This means a distribution mechanism is required
     for public keys, which might be enhanced with a trust hierarchy (like PKI).
 - Request/Response (Sync) vs. Message Queuing (Async)
diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml
index 989140d560..6bd5728b26 100644
--- a/docs/swagger/swagger.yaml
+++ b/docs/swagger/swagger.yaml
@@ -10965,4 +10965,4 @@ paths:
         default:
           description: ""
 servers:
-- url: http://localhost:12345
+- url: http://localhost:5000