diff --git a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_10.png b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_10.png
index 7b5fa322..aba80708 100644
Binary files a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_10.png and b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_10.png differ
diff --git a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_11.png b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_11.png
index 2331486c..e430af89 100644
Binary files a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_11.png and b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_11.png differ
diff --git a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_12.png b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_12.png
index 2f9478d2..49eefbb4 100644
Binary files a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_12.png and b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_12.png differ
diff --git a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_13.png b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_13.png
index 9341cff2..21b3784e 100644
Binary files a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_13.png and b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_13.png differ
diff --git a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_9.png b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_9.png
index ee4f8dcc..441379f0 100644
Binary files a/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_9.png and b/docs/modules/demos/images/nifi-kafka-druid-water-level-data/superset_9.png differ
diff --git a/docs/modules/demos/pages/nifi-kafka-druid-water-level-data.adoc b/docs/modules/demos/pages/nifi-kafka-druid-water-level-data.adoc
index 9164c4d1..1b04f96f 100644
--- a/docs/modules/demos/pages/nifi-kafka-druid-water-level-data.adoc
+++ b/docs/modules/demos/pages/nifi-kafka-druid-water-level-data.adoc
@@ -428,7 +428,7 @@ The `Avg. row size (bytes)` column shows that a typical `measurement` record has
 `222`, more than 50 times the size. So, by choosing two dedicated topics over a single topic, this demo saved 50x of
 storage and computation costs.
 
-By clicking on `segments` under `Availability` for the `measurements` data source, you can see the segments of the data source.
+Click `Segments` in the menu bar at the top to see the segments of the data source.
 In this case, the `measurements` data source is partitioned by the measurement day, resulting in 32 segments.
 
 image::nifi-kafka-druid-water-level-data/druid_5.png[]
@@ -509,12 +509,13 @@ image::nifi-kafka-druid-water-level-data/superset_8.png[]
 
 === Execute arbitrary SQL statements
 
-Within Superset, you can create dashboards and run arbitrary SQL statements. On the top, click on the tab `SQL` ->
-`SQL Lab`.
+Within Superset, you can create dashboards and run arbitrary SQL statements.
+On the top, click on the tab `SQL` -> `SQL Lab`.
 
 image::nifi-kafka-druid-water-level-data/superset_9.png[]
 
-On the left, select the database `druid`, the schema `druid` and set `See table schema` to `stations` or `measurements`.
+On the left select the database `druid`, the schema `druid` and select `stations` or `measurements` from the `druid` folder.
+Click on `Add a new tab`.
 
 image::nifi-kafka-druid-water-level-data/superset_10.png[]