diff --git a/docs/24.0.0/assets/tutorial-query-01.png b/docs/24.0.0/assets/tutorial-query-01.png
index 371d35d..c8455f6 100644
--- a/docs/24.0.0/assets/tutorial-query-01.png
+++ b/docs/24.0.0/assets/tutorial-query-01.png
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-query-02.png b/docs/24.0.0/assets/tutorial-query-02.png
index f459bd6..852d5fd 100644
--- a/docs/24.0.0/assets/tutorial-query-02.png
+++ b/docs/24.0.0/assets/tutorial-query-02.png
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-query-03.png b/docs/24.0.0/assets/tutorial-query-03.png
index 29443ed..725d373 100644
--- a/docs/24.0.0/assets/tutorial-query-03.png
+++ b/docs/24.0.0/assets/tutorial-query-03.png
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-query-035.png b/docs/24.0.0/assets/tutorial-query-035.png
deleted file mode 100644
index f22db18..0000000
--- a/docs/24.0.0/assets/tutorial-query-035.png
+++ /dev/null
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-query-04.png b/docs/24.0.0/assets/tutorial-query-04.png
index 9cfef34..8715cde 100644
--- a/docs/24.0.0/assets/tutorial-query-04.png
+++ b/docs/24.0.0/assets/tutorial-query-04.png
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-query-05.png b/docs/24.0.0/assets/tutorial-query-05.png
index 2fc59ce..a56a0ed 100644
--- a/docs/24.0.0/assets/tutorial-query-05.png
+++ b/docs/24.0.0/assets/tutorial-query-05.png
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-query-06.png b/docs/24.0.0/assets/tutorial-query-06.png
index 7056056..d17ae10 100644
--- a/docs/24.0.0/assets/tutorial-query-06.png
+++ b/docs/24.0.0/assets/tutorial-query-06.png
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-query-07.png b/docs/24.0.0/assets/tutorial-query-07.png
index 5997ba2..ddcda87 100644
--- a/docs/24.0.0/assets/tutorial-query-07.png
+++ b/docs/24.0.0/assets/tutorial-query-07.png
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-query-08.png b/docs/24.0.0/assets/tutorial-query-08.png
deleted file mode 100644
index 32aa5d4..0000000
--- a/docs/24.0.0/assets/tutorial-query-08.png
+++ /dev/null
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-quickstart-04.png b/docs/24.0.0/assets/tutorial-quickstart-04.png
index 431d8b9..e847ef5 100644
--- a/docs/24.0.0/assets/tutorial-quickstart-04.png
+++ b/docs/24.0.0/assets/tutorial-quickstart-04.png
Binary files differ
diff --git a/docs/24.0.0/assets/tutorial-quickstart-05.png b/docs/24.0.0/assets/tutorial-quickstart-05.png
index 6178289..da3ed0d 100644
--- a/docs/24.0.0/assets/tutorial-quickstart-05.png
+++ b/docs/24.0.0/assets/tutorial-quickstart-05.png
Binary files differ
diff --git a/docs/24.0.0/development/extensions-core/postgresql.html b/docs/24.0.0/development/extensions-core/postgresql.html
index 678d8f7..d67df35 100644
--- a/docs/24.0.0/development/extensions-core/postgresql.html
+++ b/docs/24.0.0/development/extensions-core/postgresql.html
@@ -113,7 +113,7 @@
 <span class="hljs-meta">druid.metadata.storage.connector.password</span>=<span class="hljs-string">diurd</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="configuration"></a><a href="#configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Configuration</h2>
-<p>In most cases, the configuration options map directly to the <a href="https://jdbc.postgresql.org/documentation/head/connect.html">postgres JDBC connection options</a>.</p>
+<p>In most cases, the configuration options map directly to the <a href="https://jdbc.postgresql.org/documentation/use/#connecting-to-the-database">postgres JDBC connection options</a>.</p>
 <table>
 <thead>
 <tr><th>Property</th><th>Description</th><th>Default</th><th>Required</th></tr>
diff --git a/docs/24.0.0/multi-stage-query/api.html b/docs/24.0.0/multi-stage-query/api.html
index f2c99cd..0712cd6 100644
--- a/docs/24.0.0/multi-stage-query/api.html
+++ b/docs/24.0.0/multi-stage-query/api.html
@@ -158,7 +158,7 @@
 <li>The task report for an entire job is associated with the <code>query_controller</code> task. The <code>query_worker</code> tasks do not have
 their own reports; their information is incorporated into the controller report.</li>
 <li>The task report API may report <code>404 Not Found</code> temporarily while the task is in the process of starting up.</li>
-<li>As an experimental feature, the SQL task engine supports running SELECT queries. SELECT query results are written into
+<li>As an experimental feature, the MSQ task engine supports running SELECT queries. SELECT query results are written into
 the <code>multiStageQuery.payload.results.results</code> task report key as an array of arrays. The behavior and result format of plain
 SELECT queries (without INSERT or REPLACE) is subject to change.</li>
 </ul>
diff --git a/docs/24.0.0/multi-stage-query/concepts.html b/docs/24.0.0/multi-stage-query/concepts.html
index 2ddcb85..2d3b0f9 100644
--- a/docs/24.0.0/multi-stage-query/concepts.html
+++ b/docs/24.0.0/multi-stage-query/concepts.html
@@ -82,7 +82,7 @@
 extension, new in Druid 24.0. Refer to the <a href="/docs/24.0.0/ingestion/index.html#batch">ingestion methods</a> table to determine which
 ingestion method is right for you.</p>
 </blockquote>
-<h2><a class="anchor" aria-hidden="true" id="sql-task-engine"></a><a href="#sql-task-engine" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>SQL task engine</h2>
+<h2><a class="anchor" aria-hidden="true" id="multi-stage-query-task-engine"></a><a href="#multi-stage-query-task-engine" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Multi-stage query task engine</h2>
 <p>The <code>druid-multi-stage-query</code> extension adds a multi-stage query (MSQ) task engine that executes SQL statements as batch
 tasks in the indexing service, which execute on <a href="/docs/24.0.0/design/architecture.html#druid-services">Middle Managers</a>.
 <a href="/docs/24.0.0/multi-stage-query/reference.html#insert">INSERT</a> and <a href="/docs/24.0.0/multi-stage-query/reference.html#replace">REPLACE</a> tasks publish
@@ -267,7 +267,7 @@
 <p>Workers use the task working directory, given by
 <a href="/docs/24.0.0/configuration/index.html#additional-peon-configuration"><code>druid.indexer.task.baseDir</code></a>, for these items. It is
 important that this directory has enough space available for these purposes.</p>
-</span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/24.0.0/multi-stage-query/index.html"><span class="arrow-prev">← </span><span>Overview</span></a><a class="docs-next button" href="/docs/24.0.0/multi-stage-query/api.html"><span>API</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#sql-task-engine">SQL task engine</a></li><li><a href="#sql-extensions">SQL extensions</a><ul class="toc-headings"><li><a href="#read-external-data-with-extern">Read external data with EXTERN</a></li><li><a href="#load-data-with-insert">Load data with INSERT</a></li><li><a href="#overwrite-data-with-replace">Overwrite data with REPLACE</a></li><li><a href="#primary-timestamp">Primary timestamp</a></li><li><a href="#partitioning-by-time">Partitioning by time</a></li><li><a href="#clustering">Clustering</a></li><li><a href="#rollup">Rollup</a></li></ul></li><li><a href="#multi-stage-query-tasks">Multi-stage query tasks</a><ul class="toc-headings"><li><a href="#execution-flow">Execution flow</a></li><li><a href="#parallelism">Parallelism</a></li><li><a href="#memory-usage">Memory usage</a></li><li><a href="#disk-usage">Disk usage</a></li></ul></li></ul></nav></div><footer class="nav-footer druid-footer" id="footer"><div class="container"><div class="text-center"><p><a href="/technology">Technology</a> · <a href="/use-cases">Use Cases</a> · <a href="/druid-powered">Powered by Druid</a> · <a href="/docs/24.0.0/">Docs</a> · <a href="/community/">Community</a> · <a href="/downloads.html">Download</a> · <a href="/faq">FAQ</a></p></div><div class="text-center"><a title="Join the user group" href="https://groups.google.com/forum/#!forum/druid-user" target="_blank"><span class="fa fa-comments"></span></a> · <a title="Follow Druid" href="https://twitter.com/druidio" target="_blank"><span class="fab fa-twitter"></span></a> · <a title="Download via Apache" href="https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ site.druid_versions[0].versions[0].version }}/apache-druid-{{ site.druid_versions[0].versions[0].version }}-bin.tar.gz" target="_blank"><span class="fas fa-feather"></span></a> · <a title="GitHub" href="https://github.com/apache/druid" target="_blank"><span class="fab fa-github"></span></a></div><div class="text-center license">Copyright © 2022 <a href="https://www.apache.org/" target="_blank">Apache Software Foundation</a>.<br/>Except where otherwise noted, licensed under <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.<br/>Apache Druid, Druid, and the Druid logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</div></div></footer></div><script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script><script>
+</span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/24.0.0/multi-stage-query/index.html"><span class="arrow-prev">← </span><span>Overview</span></a><a class="docs-next button" href="/docs/24.0.0/multi-stage-query/api.html"><span>API</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#multi-stage-query-task-engine">Multi-stage query task engine</a></li><li><a href="#sql-extensions">SQL extensions</a><ul class="toc-headings"><li><a href="#read-external-data-with-extern">Read external data with EXTERN</a></li><li><a href="#load-data-with-insert">Load data with INSERT</a></li><li><a href="#overwrite-data-with-replace">Overwrite data with REPLACE</a></li><li><a href="#primary-timestamp">Primary timestamp</a></li><li><a href="#partitioning-by-time">Partitioning by time</a></li><li><a href="#clustering">Clustering</a></li><li><a href="#rollup">Rollup</a></li></ul></li><li><a href="#multi-stage-query-tasks">Multi-stage query tasks</a><ul class="toc-headings"><li><a href="#execution-flow">Execution flow</a></li><li><a href="#parallelism">Parallelism</a></li><li><a href="#memory-usage">Memory usage</a></li><li><a href="#disk-usage">Disk usage</a></li></ul></li></ul></nav></div><footer class="nav-footer druid-footer" id="footer"><div class="container"><div class="text-center"><p><a href="/technology">Technology</a> · <a href="/use-cases">Use Cases</a> · <a href="/druid-powered">Powered by Druid</a> · <a href="/docs/24.0.0/">Docs</a> · <a href="/community/">Community</a> · <a href="/downloads.html">Download</a> · <a href="/faq">FAQ</a></p></div><div class="text-center"><a title="Join the user group" href="https://groups.google.com/forum/#!forum/druid-user" target="_blank"><span class="fa fa-comments"></span></a> · <a title="Follow Druid" href="https://twitter.com/druidio" target="_blank"><span class="fab fa-twitter"></span></a> · <a title="Download via Apache" href="https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ site.druid_versions[0].versions[0].version }}/apache-druid-{{ site.druid_versions[0].versions[0].version }}-bin.tar.gz" target="_blank"><span class="fas fa-feather"></span></a> · <a title="GitHub" href="https://github.com/apache/druid" target="_blank"><span class="fab fa-github"></span></a></div><div class="text-center license">Copyright © 2022 <a href="https://www.apache.org/" target="_blank">Apache Software Foundation</a>.<br/>Except where otherwise noted, licensed under <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.<br/>Apache Druid, Druid, and the Druid logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</div></div></footer></div><script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script><script>
                 document.addEventListener('keyup', function(e) {
                   if (e.target !== document.body) {
                     return;
diff --git a/docs/24.0.0/multi-stage-query/index.html b/docs/24.0.0/multi-stage-query/index.html
index 591abbe..39d8748 100644
--- a/docs/24.0.0/multi-stage-query/index.html
+++ b/docs/24.0.0/multi-stage-query/index.html
@@ -83,10 +83,10 @@
 ingestion method is right for you.</p>
 </blockquote>
 <p>Apache Druid supports SQL-based ingestion using the bundled <a href="#load-the-extension"><code>druid-multi-stage-query</code> extension</a>.
-This extension adds a <a href="/docs/24.0.0/multi-stage-query/concepts.html#sql-task-engine">multi-stage query task engine for SQL</a> that allows running SQL
+This extension adds a <a href="/docs/24.0.0/multi-stage-query/concepts.html#multi-stage-query-task-engine">multi-stage query task engine for SQL</a> that allows running SQL
 <a href="/docs/24.0.0/multi-stage-query/concepts.html#insert">INSERT</a> and <a href="/docs/24.0.0/multi-stage-query/concepts.html#replace">REPLACE</a> statements as batch tasks. As an experimental feature,
 the task engine also supports running SELECT queries as batch tasks.</p>
-<p>Nearly all SELECT capabilities are available in the SQL task engine, with certain exceptions listed on the <a href="/docs/24.0.0/multi-stage-query/known-issues.html#select">Known
+<p>Nearly all SELECT capabilities are available in the multi-stage query (MSQ) task engine, with certain exceptions listed on the <a href="/docs/24.0.0/multi-stage-query/known-issues.html#select">Known
 issues</a> page. This allows great flexibility to apply transformations, filters, JOINs,
 aggregations, and so on as part of <code>INSERT ... SELECT</code> and <code>REPLACE ... SELECT</code> statements. This also allows in-database
 transformation: creating new tables based on queries of other tables.</p>
diff --git a/docs/24.0.0/tutorials/index.html b/docs/24.0.0/tutorials/index.html
index 4fff41c..56ad799 100644
--- a/docs/24.0.0/tutorials/index.html
+++ b/docs/24.0.0/tutorials/index.html
@@ -203,6 +203,7 @@
 </code></pre>
 <p></details></p></li>
 <li><p>Optionally, click <strong>Preview</strong> to see the general shape of the data before you ingest it.</p></li>
+<li><p>Edit the first line of the query and change the default destination datasource name from <code>wikiticker-2015-09-12-sampled</code> to <code>wikipedia</code>.</p></li>
 <li><p>Click <strong>Run</strong> to execute the query. The task may take a minute or two to complete. When done, the task displays its duration and the number of rows inserted into the table. The view is set to automatically refresh, so you don't need to refresh the browser to see the status change.</p>
 <p><img src="../assets/tutorial-quickstart-04.png" alt="Run query" title="Run query"></p>
 <p>A successful task means that Druid data servers have picked up one or more segments.</p></li>
@@ -213,7 +214,7 @@
 <pre><code class="hljs css language-sql"><span class="hljs-keyword">SELECT</span>
   channel,
   <span class="hljs-keyword">COUNT</span>(*)
-<span class="hljs-keyword">FROM</span> <span class="hljs-string">"wikiticker-2015-09-12-sampled"</span>
+<span class="hljs-keyword">FROM</span> <span class="hljs-string">"wikipedia"</span>
 <span class="hljs-keyword">GROUP</span> <span class="hljs-keyword">BY</span> channel
 <span class="hljs-keyword">ORDER</span> <span class="hljs-keyword">BY</span> <span class="hljs-keyword">COUNT</span>(*) <span class="hljs-keyword">DESC</span>
 </code></pre>
@@ -222,7 +223,7 @@
 <h2><a class="anchor" aria-hidden="true" id="next-steps"></a><a href="#next-steps" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Next steps</h2>
 <p>See the following topics for more information:</p>
 <ul>
-<li><a href="/docs/24.0.0/querying/sql.html">Druid SQL overview</a> to learn about how to query the data you just ingested.</li>
+<li><a href="/docs/24.0.0/querying/sql.html">Druid SQL overview</a> or the <a href="/docs/24.0.0/tutorials/tutorial-query.html">Query tutorial</a> to learn about how to query the data you just ingested.</li>
 <li><a href="/docs/24.0.0/ingestion/index.html">Ingestion overview</a> to explore options for ingesting more data.</li>
 <li><a href="/docs/24.0.0/tutorials/tutorial-msq-extern.html">Tutorial: Load files using SQL</a> to learn how to generate a SQL query that loads external data into a Druid datasource.</li>
 <li><a href="/docs/24.0.0/tutorials/tutorial-batch-native.html">Tutorial: Load data with native batch ingestion</a> to load and query data with Druid's native batch ingestion feature.</li>
diff --git a/docs/24.0.0/tutorials/tutorial-query.html b/docs/24.0.0/tutorials/tutorial-query.html
index 1c33057..deb31fd 100644
--- a/docs/24.0.0/tutorials/tutorial-query.html
+++ b/docs/24.0.0/tutorials/tutorial-query.html
@@ -105,11 +105,9 @@
 <p>A SELECT query appears in the query edit pane and immediately runs. However, in this case, the query
 returns no data, since by default the query filters for data from the last day, while our data is considerably
 older than that. Let's remove the filter.</p></li>
-<li><p>In the datasource tree, click <code>__time</code> and <strong>Remove Filter</strong>.</p>
-<p><img src="../assets/tutorial-query-03.png" alt="Clear WHERE filter" title="Clear WHERE filter"></p></li>
 <li><p>Click <strong>Run</strong> to run the query.</p>
 <p>You should now see two columns of data, a page name and the count:</p>
-<p><img src="../assets/tutorial-query-04.png" alt="Query results" title="Query results"></p>
+<p><img src="../assets/tutorial-query-03.png" alt="Query results" title="Query results"></p>
 <p>Notice that the results are limited in the console to about a hundred, by default, due to the <strong>Smart query limit</strong>
 feature. This helps users avoid inadvertently running queries that return an excessive amount of data, possibly
 overwhelming their system.</p></li>
@@ -137,18 +135,18 @@
 <p>When you run the query again, notice that we're getting the new dimension,<code>countryName</code>, but for most of the rows, its value
 is null. Let's
 show only rows with a <code>countryName</code> value.</p></li>
-<li><p>Click the countryName dimension in the left pane and choose the first filtering option. It's not exactly what we want, but
+<li><p>Click the <code>countryName</code> dimension in the left pane and choose the first filtering option. It's not exactly what we want, but
 we'll edit it by hand. The new WHERE clause should appear in your query.</p></li>
 <li><p>Modify the WHERE clause to exclude results that do not have a value for countryName:</p>
 <pre><code class="hljs css language-sql">WHERE "countryName" IS NOT NULL
 </code></pre>
 <p>Run the query again. You should now see the top edits by country:</p>
-<p><img src="../assets/tutorial-query-035.png" alt="Finished query" title="Finished query"></p></li>
+<p><img src="../assets/tutorial-query-04.png" alt="Finished query" title="Finished query"></p></li>
 <li><p>Under the covers, every Druid SQL query is translated into a query in the JSON-based <em>Druid native query</em> format before it runs
 on data nodes. You can view the native query for this query by clicking <code>...</code> and <strong>Explain SQL Query</strong>.</p>
 <p>While you can use Druid SQL for most purposes, familiarity with native query is useful for composing complex queries and for troubleshooting
 performance issues. For more information, see <a href="/docs/24.0.0/querying/querying.html">Native queries</a>.</p>
-<p><img src="../assets/tutorial-query-06.png" alt="Explain query" title="Explain query"></p>
+<p><img src="../assets/tutorial-query-05.png" alt="Explain query" title="Explain query"></p>
 <blockquote>
 <p>Another way to view the explain plan is by adding EXPLAIN PLAN FOR to the front of your query, as follows:</p>
 <pre><code class="hljs css language-sql"><span class="hljs-keyword">EXPLAIN</span> PLAN <span class="hljs-keyword">FOR</span>
@@ -178,14 +176,14 @@
 <span class="hljs-keyword">FROM</span> wikipedia <span class="hljs-keyword">WHERE</span> TIME_IN_INTERVAL(<span class="hljs-string">"__time"</span>, <span class="hljs-string">'2015-09-12/2015-09-13'</span>)
 <span class="hljs-keyword">GROUP</span> <span class="hljs-keyword">BY</span> <span class="hljs-number">1</span>
 </code></pre>
-<p><img src="../assets/tutorial-query-07.png" alt="Query example" title="Query example"></p>
+<p><img src="../assets/tutorial-query-06.png" alt="Query example" title="Query example"></p>
 <h3><a class="anchor" aria-hidden="true" id="general-group-by"></a><a href="#general-group-by" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>General group by</h3>
 <pre><code class="hljs css language-sql"><span class="hljs-keyword">SELECT</span> channel, page, <span class="hljs-keyword">SUM</span>(added)
 <span class="hljs-keyword">FROM</span> wikipedia <span class="hljs-keyword">WHERE</span> TIME_IN_INTERVAL(<span class="hljs-string">"__time"</span>, <span class="hljs-string">'2015-09-12/2015-09-13'</span>)
 <span class="hljs-keyword">GROUP</span> <span class="hljs-keyword">BY</span> channel, page
 <span class="hljs-keyword">ORDER</span> <span class="hljs-keyword">BY</span> <span class="hljs-keyword">SUM</span>(added) <span class="hljs-keyword">DESC</span>
 </code></pre>
-<p><img src="../assets/tutorial-query-08.png" alt="Query example" title="Query example"></p>
+<p><img src="../assets/tutorial-query-07.png" alt="Query example" title="Query example"></p>
 <h2><a class="anchor" aria-hidden="true" id="other-ways-to-invoke-sql-queries"></a><a href="#other-ways-to-invoke-sql-queries" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Other ways to invoke SQL queries</h2>
 <h3><a class="anchor" aria-hidden="true" id="query-sql-via-dsql"></a><a href="#query-sql-via-dsql" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Query SQL via dsql</h3>
 <p>For convenience, the Druid package includes a SQL command-line client, located at <code>bin/dsql</code> in the Druid package root.</p>
diff --git a/docs/latest/assets/tutorial-query-01.png b/docs/latest/assets/tutorial-query-01.png
index 371d35d..c8455f6 100644
--- a/docs/latest/assets/tutorial-query-01.png
+++ b/docs/latest/assets/tutorial-query-01.png
Binary files differ
diff --git a/docs/latest/assets/tutorial-query-02.png b/docs/latest/assets/tutorial-query-02.png
index f459bd6..852d5fd 100644
--- a/docs/latest/assets/tutorial-query-02.png
+++ b/docs/latest/assets/tutorial-query-02.png
Binary files differ
diff --git a/docs/latest/assets/tutorial-query-03.png b/docs/latest/assets/tutorial-query-03.png
index 29443ed..725d373 100644
--- a/docs/latest/assets/tutorial-query-03.png
+++ b/docs/latest/assets/tutorial-query-03.png
Binary files differ
diff --git a/docs/latest/assets/tutorial-query-035.png b/docs/latest/assets/tutorial-query-035.png
deleted file mode 100644
index f22db18..0000000
--- a/docs/latest/assets/tutorial-query-035.png
+++ /dev/null
Binary files differ
diff --git a/docs/latest/assets/tutorial-query-04.png b/docs/latest/assets/tutorial-query-04.png
index 9cfef34..8715cde 100644
--- a/docs/latest/assets/tutorial-query-04.png
+++ b/docs/latest/assets/tutorial-query-04.png
Binary files differ
diff --git a/docs/latest/assets/tutorial-query-05.png b/docs/latest/assets/tutorial-query-05.png
index 2fc59ce..a56a0ed 100644
--- a/docs/latest/assets/tutorial-query-05.png
+++ b/docs/latest/assets/tutorial-query-05.png
Binary files differ
diff --git a/docs/latest/assets/tutorial-query-06.png b/docs/latest/assets/tutorial-query-06.png
index 7056056..d17ae10 100644
--- a/docs/latest/assets/tutorial-query-06.png
+++ b/docs/latest/assets/tutorial-query-06.png
Binary files differ
diff --git a/docs/latest/assets/tutorial-query-07.png b/docs/latest/assets/tutorial-query-07.png
index 5997ba2..ddcda87 100644
--- a/docs/latest/assets/tutorial-query-07.png
+++ b/docs/latest/assets/tutorial-query-07.png
Binary files differ
diff --git a/docs/latest/assets/tutorial-query-08.png b/docs/latest/assets/tutorial-query-08.png
deleted file mode 100644
index 32aa5d4..0000000
--- a/docs/latest/assets/tutorial-query-08.png
+++ /dev/null
Binary files differ
diff --git a/docs/latest/assets/tutorial-quickstart-04.png b/docs/latest/assets/tutorial-quickstart-04.png
index 431d8b9..e847ef5 100644
--- a/docs/latest/assets/tutorial-quickstart-04.png
+++ b/docs/latest/assets/tutorial-quickstart-04.png
Binary files differ
diff --git a/docs/latest/assets/tutorial-quickstart-05.png b/docs/latest/assets/tutorial-quickstart-05.png
index 6178289..da3ed0d 100644
--- a/docs/latest/assets/tutorial-quickstart-05.png
+++ b/docs/latest/assets/tutorial-quickstart-05.png
Binary files differ
diff --git a/docs/latest/development/extensions-core/postgresql.html b/docs/latest/development/extensions-core/postgresql.html
index cb7d583..e8b6dae 100644
--- a/docs/latest/development/extensions-core/postgresql.html
+++ b/docs/latest/development/extensions-core/postgresql.html
@@ -113,7 +113,7 @@
 <span class="hljs-meta">druid.metadata.storage.connector.password</span>=<span class="hljs-string">diurd</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="configuration"></a><a href="#configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Configuration</h2>
-<p>In most cases, the configuration options map directly to the <a href="https://jdbc.postgresql.org/documentation/head/connect.html">postgres JDBC connection options</a>.</p>
+<p>In most cases, the configuration options map directly to the <a href="https://jdbc.postgresql.org/documentation/use/#connecting-to-the-database">postgres JDBC connection options</a>.</p>
 <table>
 <thead>
 <tr><th>Property</th><th>Description</th><th>Default</th><th>Required</th></tr>
diff --git a/docs/latest/multi-stage-query/api.html b/docs/latest/multi-stage-query/api.html
index 54b95cf..96d4c21 100644
--- a/docs/latest/multi-stage-query/api.html
+++ b/docs/latest/multi-stage-query/api.html
@@ -158,7 +158,7 @@
 <li>The task report for an entire job is associated with the <code>query_controller</code> task. The <code>query_worker</code> tasks do not have
 their own reports; their information is incorporated into the controller report.</li>
 <li>The task report API may report <code>404 Not Found</code> temporarily while the task is in the process of starting up.</li>
-<li>As an experimental feature, the SQL task engine supports running SELECT queries. SELECT query results are written into
+<li>As an experimental feature, the MSQ task engine supports running SELECT queries. SELECT query results are written into
 the <code>multiStageQuery.payload.results.results</code> task report key as an array of arrays. The behavior and result format of plain
 SELECT queries (without INSERT or REPLACE) is subject to change.</li>
 </ul>
diff --git a/docs/latest/multi-stage-query/concepts.html b/docs/latest/multi-stage-query/concepts.html
index 073306d..7af4c59 100644
--- a/docs/latest/multi-stage-query/concepts.html
+++ b/docs/latest/multi-stage-query/concepts.html
@@ -82,7 +82,7 @@
 extension, new in Druid 24.0. Refer to the <a href="/docs/latest/ingestion/index.html#batch">ingestion methods</a> table to determine which
 ingestion method is right for you.</p>
 </blockquote>
-<h2><a class="anchor" aria-hidden="true" id="sql-task-engine"></a><a href="#sql-task-engine" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>SQL task engine</h2>
+<h2><a class="anchor" aria-hidden="true" id="multi-stage-query-task-engine"></a><a href="#multi-stage-query-task-engine" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Multi-stage query task engine</h2>
 <p>The <code>druid-multi-stage-query</code> extension adds a multi-stage query (MSQ) task engine that executes SQL statements as batch
 tasks in the indexing service, which execute on <a href="/docs/latest/design/architecture.html#druid-services">Middle Managers</a>.
 <a href="/docs/latest/multi-stage-query/reference.html#insert">INSERT</a> and <a href="/docs/latest/multi-stage-query/reference.html#replace">REPLACE</a> tasks publish
@@ -267,7 +267,7 @@
 <p>Workers use the task working directory, given by
 <a href="/docs/latest/configuration/index.html#additional-peon-configuration"><code>druid.indexer.task.baseDir</code></a>, for these items. It is
 important that this directory has enough space available for these purposes.</p>
-</span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/latest/multi-stage-query/index.html"><span class="arrow-prev">← </span><span>Overview</span></a><a class="docs-next button" href="/docs/latest/multi-stage-query/api.html"><span>API</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#sql-task-engine">SQL task engine</a></li><li><a href="#sql-extensions">SQL extensions</a><ul class="toc-headings"><li><a href="#read-external-data-with-extern">Read external data with EXTERN</a></li><li><a href="#load-data-with-insert">Load data with INSERT</a></li><li><a href="#overwrite-data-with-replace">Overwrite data with REPLACE</a></li><li><a href="#primary-timestamp">Primary timestamp</a></li><li><a href="#partitioning-by-time">Partitioning by time</a></li><li><a href="#clustering">Clustering</a></li><li><a href="#rollup">Rollup</a></li></ul></li><li><a href="#multi-stage-query-tasks">Multi-stage query tasks</a><ul class="toc-headings"><li><a href="#execution-flow">Execution flow</a></li><li><a href="#parallelism">Parallelism</a></li><li><a href="#memory-usage">Memory usage</a></li><li><a href="#disk-usage">Disk usage</a></li></ul></li></ul></nav></div><footer class="nav-footer druid-footer" id="footer"><div class="container"><div class="text-center"><p><a href="/technology">Technology</a> · <a href="/use-cases">Use Cases</a> · <a href="/druid-powered">Powered by Druid</a> · <a href="/docs/latest/">Docs</a> · <a href="/community/">Community</a> · <a href="/downloads.html">Download</a> · <a href="/faq">FAQ</a></p></div><div class="text-center"><a title="Join the user group" href="https://groups.google.com/forum/#!forum/druid-user" target="_blank"><span class="fa fa-comments"></span></a> · <a title="Follow Druid" href="https://twitter.com/druidio" target="_blank"><span class="fab fa-twitter"></span></a> · <a title="Download via Apache" href="https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ site.druid_versions[0].versions[0].version }}/apache-druid-{{ site.druid_versions[0].versions[0].version }}-bin.tar.gz" target="_blank"><span class="fas fa-feather"></span></a> · <a title="GitHub" href="https://github.com/apache/druid" target="_blank"><span class="fab fa-github"></span></a></div><div class="text-center license">Copyright © 2022 <a href="https://www.apache.org/" target="_blank">Apache Software Foundation</a>.<br/>Except where otherwise noted, licensed under <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.<br/>Apache Druid, Druid, and the Druid logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</div></div></footer></div><script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script><script>
+</span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/latest/multi-stage-query/index.html"><span class="arrow-prev">← </span><span>Overview</span></a><a class="docs-next button" href="/docs/latest/multi-stage-query/api.html"><span>API</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#multi-stage-query-task-engine">Multi-stage query task engine</a></li><li><a href="#sql-extensions">SQL extensions</a><ul class="toc-headings"><li><a href="#read-external-data-with-extern">Read external data with EXTERN</a></li><li><a href="#load-data-with-insert">Load data with INSERT</a></li><li><a href="#overwrite-data-with-replace">Overwrite data with REPLACE</a></li><li><a href="#primary-timestamp">Primary timestamp</a></li><li><a href="#partitioning-by-time">Partitioning by time</a></li><li><a href="#clustering">Clustering</a></li><li><a href="#rollup">Rollup</a></li></ul></li><li><a href="#multi-stage-query-tasks">Multi-stage query tasks</a><ul class="toc-headings"><li><a href="#execution-flow">Execution flow</a></li><li><a href="#parallelism">Parallelism</a></li><li><a href="#memory-usage">Memory usage</a></li><li><a href="#disk-usage">Disk usage</a></li></ul></li></ul></nav></div><footer class="nav-footer druid-footer" id="footer"><div class="container"><div class="text-center"><p><a href="/technology">Technology</a> · <a href="/use-cases">Use Cases</a> · <a href="/druid-powered">Powered by Druid</a> · <a href="/docs/latest/">Docs</a> · <a href="/community/">Community</a> · <a href="/downloads.html">Download</a> · <a href="/faq">FAQ</a></p></div><div class="text-center"><a title="Join the user group" href="https://groups.google.com/forum/#!forum/druid-user" target="_blank"><span class="fa fa-comments"></span></a> · <a title="Follow Druid" href="https://twitter.com/druidio" target="_blank"><span class="fab fa-twitter"></span></a> · <a title="Download via Apache" href="https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ site.druid_versions[0].versions[0].version }}/apache-druid-{{ site.druid_versions[0].versions[0].version }}-bin.tar.gz" target="_blank"><span class="fas fa-feather"></span></a> · <a title="GitHub" href="https://github.com/apache/druid" target="_blank"><span class="fab fa-github"></span></a></div><div class="text-center license">Copyright © 2022 <a href="https://www.apache.org/" target="_blank">Apache Software Foundation</a>.<br/>Except where otherwise noted, licensed under <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.<br/>Apache Druid, Druid, and the Druid logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</div></div></footer></div><script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script><script>
                 document.addEventListener('keyup', function(e) {
                   if (e.target !== document.body) {
                     return;
diff --git a/docs/latest/multi-stage-query/index.html b/docs/latest/multi-stage-query/index.html
index 17f79cc..ab9b2ef 100644
--- a/docs/latest/multi-stage-query/index.html
+++ b/docs/latest/multi-stage-query/index.html
@@ -83,10 +83,10 @@
 ingestion method is right for you.</p>
 </blockquote>
 <p>Apache Druid supports SQL-based ingestion using the bundled <a href="#load-the-extension"><code>druid-multi-stage-query</code> extension</a>.
-This extension adds a <a href="/docs/latest/multi-stage-query/concepts.html#sql-task-engine">multi-stage query task engine for SQL</a> that allows running SQL
+This extension adds a <a href="/docs/latest/multi-stage-query/concepts.html#multi-stage-query-task-engine">multi-stage query task engine for SQL</a> that allows running SQL
 <a href="/docs/latest/multi-stage-query/concepts.html#insert">INSERT</a> and <a href="/docs/latest/multi-stage-query/concepts.html#replace">REPLACE</a> statements as batch tasks. As an experimental feature,
 the task engine also supports running SELECT queries as batch tasks.</p>
-<p>Nearly all SELECT capabilities are available in the SQL task engine, with certain exceptions listed on the <a href="/docs/latest/multi-stage-query/known-issues.html#select">Known
+<p>Nearly all SELECT capabilities are available in the multi-stage query (MSQ) task engine, with certain exceptions listed on the <a href="/docs/latest/multi-stage-query/known-issues.html#select">Known
 issues</a> page. This allows great flexibility to apply transformations, filters, JOINs,
 aggregations, and so on as part of <code>INSERT ... SELECT</code> and <code>REPLACE ... SELECT</code> statements. This also allows in-database
 transformation: creating new tables based on queries of other tables.</p>
diff --git a/docs/latest/tutorials/index.html b/docs/latest/tutorials/index.html
index fd43cb3..fb92451 100644
--- a/docs/latest/tutorials/index.html
+++ b/docs/latest/tutorials/index.html
@@ -203,6 +203,7 @@
 </code></pre>
 <p></details></p></li>
 <li><p>Optionally, click <strong>Preview</strong> to see the general shape of the data before you ingest it.</p></li>
+<li><p>Edit the first line of the query and change the default destination datasource name from <code>wikiticker-2015-09-12-sampled</code> to <code>wikipedia</code>.</p></li>
 <li><p>Click <strong>Run</strong> to execute the query. The task may take a minute or two to complete. When done, the task displays its duration and the number of rows inserted into the table. The view is set to automatically refresh, so you don't need to refresh the browser to see the status change.</p>
 <p><img src="../assets/tutorial-quickstart-04.png" alt="Run query" title="Run query"></p>
 <p>A successful task means that Druid data servers have picked up one or more segments.</p></li>
@@ -213,7 +214,7 @@
 <pre><code class="hljs css language-sql"><span class="hljs-keyword">SELECT</span>
   channel,
   <span class="hljs-keyword">COUNT</span>(*)
-<span class="hljs-keyword">FROM</span> <span class="hljs-string">"wikiticker-2015-09-12-sampled"</span>
+<span class="hljs-keyword">FROM</span> <span class="hljs-string">"wikipedia"</span>
 <span class="hljs-keyword">GROUP</span> <span class="hljs-keyword">BY</span> channel
 <span class="hljs-keyword">ORDER</span> <span class="hljs-keyword">BY</span> <span class="hljs-keyword">COUNT</span>(*) <span class="hljs-keyword">DESC</span>
 </code></pre>
@@ -222,7 +223,7 @@
 <h2><a class="anchor" aria-hidden="true" id="next-steps"></a><a href="#next-steps" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Next steps</h2>
 <p>See the following topics for more information:</p>
 <ul>
-<li><a href="/docs/latest/querying/sql.html">Druid SQL overview</a> to learn about how to query the data you just ingested.</li>
+<li><a href="/docs/latest/querying/sql.html">Druid SQL overview</a> or the <a href="/docs/latest/tutorials/tutorial-query.html">Query tutorial</a> to learn about how to query the data you just ingested.</li>
 <li><a href="/docs/latest/ingestion/index.html">Ingestion overview</a> to explore options for ingesting more data.</li>
 <li><a href="/docs/latest/tutorials/tutorial-msq-extern.html">Tutorial: Load files using SQL</a> to learn how to generate a SQL query that loads external data into a Druid datasource.</li>
 <li><a href="/docs/latest/tutorials/tutorial-batch-native.html">Tutorial: Load data with native batch ingestion</a> to load and query data with Druid's native batch ingestion feature.</li>
diff --git a/docs/latest/tutorials/tutorial-query.html b/docs/latest/tutorials/tutorial-query.html
index 8f23ada..45f88ce 100644
--- a/docs/latest/tutorials/tutorial-query.html
+++ b/docs/latest/tutorials/tutorial-query.html
@@ -105,11 +105,9 @@
 <p>A SELECT query appears in the query edit pane and immediately runs. However, in this case, the query
 returns no data, since by default the query filters for data from the last day, while our data is considerably
 older than that. Let's remove the filter.</p></li>
-<li><p>In the datasource tree, click <code>__time</code> and <strong>Remove Filter</strong>.</p>
-<p><img src="../assets/tutorial-query-03.png" alt="Clear WHERE filter" title="Clear WHERE filter"></p></li>
 <li><p>Click <strong>Run</strong> to run the query.</p>
 <p>You should now see two columns of data, a page name and the count:</p>
-<p><img src="../assets/tutorial-query-04.png" alt="Query results" title="Query results"></p>
+<p><img src="../assets/tutorial-query-03.png" alt="Query results" title="Query results"></p>
 <p>Notice that the results are limited in the console to about a hundred, by default, due to the <strong>Smart query limit</strong>
 feature. This helps users avoid inadvertently running queries that return an excessive amount of data, possibly
 overwhelming their system.</p></li>
@@ -137,18 +135,18 @@
 <p>When you run the query again, notice that we're getting the new dimension,<code>countryName</code>, but for most of the rows, its value
 is null. Let's
 show only rows with a <code>countryName</code> value.</p></li>
-<li><p>Click the countryName dimension in the left pane and choose the first filtering option. It's not exactly what we want, but
+<li><p>Click the <code>countryName</code> dimension in the left pane and choose the first filtering option. It's not exactly what we want, but
 we'll edit it by hand. The new WHERE clause should appear in your query.</p></li>
 <li><p>Modify the WHERE clause to exclude results that do not have a value for countryName:</p>
 <pre><code class="hljs css language-sql">WHERE "countryName" IS NOT NULL
 </code></pre>
 <p>Run the query again. You should now see the top edits by country:</p>
-<p><img src="../assets/tutorial-query-035.png" alt="Finished query" title="Finished query"></p></li>
+<p><img src="../assets/tutorial-query-04.png" alt="Finished query" title="Finished query"></p></li>
 <li><p>Under the covers, every Druid SQL query is translated into a query in the JSON-based <em>Druid native query</em> format before it runs
 on data nodes. You can view the native query for this query by clicking <code>...</code> and <strong>Explain SQL Query</strong>.</p>
 <p>While you can use Druid SQL for most purposes, familiarity with native query is useful for composing complex queries and for troubleshooting
 performance issues. For more information, see <a href="/docs/latest/querying/querying.html">Native queries</a>.</p>
-<p><img src="../assets/tutorial-query-06.png" alt="Explain query" title="Explain query"></p>
+<p><img src="../assets/tutorial-query-05.png" alt="Explain query" title="Explain query"></p>
 <blockquote>
 <p>Another way to view the explain plan is by adding EXPLAIN PLAN FOR to the front of your query, as follows:</p>
 <pre><code class="hljs css language-sql"><span class="hljs-keyword">EXPLAIN</span> PLAN <span class="hljs-keyword">FOR</span>
@@ -178,14 +176,14 @@
 <span class="hljs-keyword">FROM</span> wikipedia <span class="hljs-keyword">WHERE</span> TIME_IN_INTERVAL(<span class="hljs-string">"__time"</span>, <span class="hljs-string">'2015-09-12/2015-09-13'</span>)
 <span class="hljs-keyword">GROUP</span> <span class="hljs-keyword">BY</span> <span class="hljs-number">1</span>
 </code></pre>
-<p><img src="../assets/tutorial-query-07.png" alt="Query example" title="Query example"></p>
+<p><img src="../assets/tutorial-query-06.png" alt="Query example" title="Query example"></p>
 <h3><a class="anchor" aria-hidden="true" id="general-group-by"></a><a href="#general-group-by" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>General group by</h3>
 <pre><code class="hljs css language-sql"><span class="hljs-keyword">SELECT</span> channel, page, <span class="hljs-keyword">SUM</span>(added)
 <span class="hljs-keyword">FROM</span> wikipedia <span class="hljs-keyword">WHERE</span> TIME_IN_INTERVAL(<span class="hljs-string">"__time"</span>, <span class="hljs-string">'2015-09-12/2015-09-13'</span>)
 <span class="hljs-keyword">GROUP</span> <span class="hljs-keyword">BY</span> channel, page
 <span class="hljs-keyword">ORDER</span> <span class="hljs-keyword">BY</span> <span class="hljs-keyword">SUM</span>(added) <span class="hljs-keyword">DESC</span>
 </code></pre>
-<p><img src="../assets/tutorial-query-08.png" alt="Query example" title="Query example"></p>
+<p><img src="../assets/tutorial-query-07.png" alt="Query example" title="Query example"></p>
 <h2><a class="anchor" aria-hidden="true" id="other-ways-to-invoke-sql-queries"></a><a href="#other-ways-to-invoke-sql-queries" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Other ways to invoke SQL queries</h2>
 <h3><a class="anchor" aria-hidden="true" id="query-sql-via-dsql"></a><a href="#query-sql-via-dsql" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Query SQL via dsql</h3>
 <p>For convenience, the Druid package includes a SQL command-line client, located at <code>bin/dsql</code> in the Druid package root.</p>