diff --git a/docs/users-guide/13-sql-parameters.md b/docs/users-guide/13-sql-parameters.md
index c203dea06584257751759095b0fe3ea716154364..fd1037919e8557d5e7bc4751308b8d496da517a5 100644
--- a/docs/users-guide/13-sql-parameters.md
+++ b/docs/users-guide/13-sql-parameters.md
@@ -1,18 +1,16 @@
-## SQL Parameters
+# Creating SQL templates
-Metabase has the flexible ability to allow variables in native (SQL) queries. This lets you dynamically replace values in your queries using filter widgets or through the query's URL.
+You can create SQL templates by adding variables to your SQL queries in the [Native/SQL editor][sql-editor]. These variables will create filter widgets that you can use to change the variable's value in the query. You can also add parameters to your question's URL to set the filters' values, so that when the question loads, those values are inserted into the variables.
-Options and settings for your variables will appear in the `Variables` side panel of the native query builder once you've defined a variable. So, how do you define a variable?
+## Defining variables
-
+Typing `{% raw %}{{variable_name}}{% endraw %}` in your native query creates a variable called `variable_name`.
-### Defining Variables
+Field Filter, a special type of filter, have a [slightly different syntax](#field-filter-syntax).
-Typing `{% raw %}{{variable_name}}{% endraw %}` in your native query creates a variable called `variable_name`. Variables can be given types in the side panel, which changes their behavior. All variable types other than "Field Filter" will cause a filter widget to be placed on this question corresponding to the chosen variable type. When a value is selected via a filter widget, that value replaces the corresponding variable in the SQL template, wherever it appears. If you have multiple filter widgets, you can click and drag on any of them to move and reorder them.
-
-This example defines a variable called `cat`, allowing you to dynamically change the `WHERE` clause in this query:
+This example defines a **Text** variable called `cat`:
```
SELECT count(*)
@@ -20,109 +18,87 @@ FROM products
WHERE category = {% raw %}{{cat}}{% endraw %}
```
-If you're writing a native MongoDB query, your query would look more like this, with the `cat` variable being defined inside of the `match` clause.
+Metabase will read the variable and attach a filter widget to the query, which people can use to change the value inserted into the `cat` variable with quotes. So if someone entered "Gizmo" into the filter widget, the query Metabase would run would be:
```
-{% raw %}[{ $match: { category: {{cat}} } }]{% endraw %}
+SELECT count(*)
+FROM products
+WHERE category = 'Gizmo'
```
-To learn more about SQL variables, check out [Create filter widgets for charts using SQL variables](https://www.metabase.com/blog/sql-template-variables/index.html).
-
-### The Field Filter variable type
+If you're writing a native MongoDB query, your query would look more like this, with the `cat` variable being defined inside of the `match` clause.
-Setting a variable to the "Field Filter" type allows you to map it to a field in any table in the current database, and lets you display a dropdown filter widget filled with the values of the field you connected it to. Field filter variables also allow you to connect your SQL question to a dashboard filter if you put it in a dashboard.
+```
+{% raw %}[{ $match: { category: {{cat}} } }]{% endraw %}
+```
-A field filter variable inserts SQL similar to that generated by the GUI query builder when adding filters on existing columns. This is useful because it lets you do things like insert dynamic date range filters into your native query. When adding a field filter, you should link that variable to a specific column. Field filter variables should be used inside of a `WHERE` clause in SQL, or a `$match` clause in MongoDB.
+## Setting SQL variables
-**Note:**
+To set a SQL variable to a value, you can either:
-- Table aliases are not supported, because field filters generate SQL based on the mapped field.
-- Some databases require the schema in the `FROM` clause. An example for Oracle would be `FROM "schema"."table"`. In BigQuery, back ticks are needed, like `` FROM `dataset_name.table` ``.
+- Enter a value into the filter widget, and re-run the question, or
+- Add a parameter to the URL and load the page.
-Example:
+To add a value to the URL, follow this syntax:
```
-SELECT count(*)
-FROM products
-WHERE {% raw %}{{date_var}}{% endraw %}
+?variable_name=value
```
-A MongoDB native query example might look like this:
+For example, to set the `{% raw %}{{cat}}{%endraw%}` variable on a question to the value "Gizmo", your URL would look something like:
```
-{% raw %}[ {$match: {{date_var}} } ]{% endraw %}
+https://metabase.example.com/question/42-eg-question?cat=Gizmo
```
-#### Creating SQL question filters using field filter variables
-
-First, insert a variable tag in your SQL, like `{% raw %}{{my_var}}{% endraw %}`. Then, in the side panel, select the "Field Filter" variable type, and choose which field to map your variable to. In order to display a filter widget, you'll have to choose a field whose "Type" in the "Data Model" section of the Admin Panel is one of the following:
+To set multiple variables, separate parameters with an ampersand (`&`):
-- Category
-- City
-- Entity Key
-- Entity Name
-- Foreign Key
-- State
-- UNIX Timestamp (Seconds)
-- UNIX Timestamp (Milliseconds)
-- ZIP or Postal Code
-
-The field can also be a datetime, which can be left as "No semantic type" in the data model.
+```
+https://metabase.example.com/question/42-eg-question?cat=Gizmo&maxprice=50
+```
-You'll then see a dropdown labeled "Widget," which will let you choose the kind of filter widget you want on your question, which is especially useful for datetime fields. You can select "None" if you don't want a widget on the question at all, which you might do, for example, if you just want to allow this question to be mapped to a dashboard filter (see more on that below).
+## SQL variable types
-**Note:** If you're not seeing the option to display a filter widget, make sure the mapped field is set to one of the above types, and then try manually syncing your database from the "Databases" section of the Admin Panel to force Metabase to scan and cache the field's values.
+When you define a variable, the **Variables** side panel will appear. You can set a type for a variable, which changes the kind of filter widget that Metabase presents.
-Filter widgets **can't** be displayed if the variable is mapped to a field marked as:
+There are four types of variables:
-- Avatar Image URL
-- Description
-- Email
-- Enum
-- Field containing JSON
-- Image URL
-- Number
-- Latitude
-- Longitude
-- URL
+- **Text**: a plain input box.
+- **Number**: a plain input box.
+- **Date**: a simple date picker. If you want a more expressive date picker, like specifying a range, you'll want to use a Field Filter.
+- **[Field Filter](#the-field-filter-variable-type)**: different filter widgets, depending on the mapped field.
-You can learn more in [Field Filters: create smart filter widgets for SQL questions](https://www.metabase.com/blog/field-filters/index.html)
+That last variable type, [Field Filter](#the-field-filter-variable-type), is special; it lets you create "smart" filter widgets, like a search box, or a dropdown menu of values, or a dynamic date picker that allows you to specify a date range.
-#### Setting a default value
+You can include multiple variables in the query, and Metabase will add multiple filter widgets to the question. When you have multiple filter widgets, you can click on a filter widget and drag it around to rearrange the order.
-If you input a default value for your field filter, this value will be selected in the filter whenever you come back to this question. If you clear out the filter, though, no value will be passed (i.e., not even the default value). **The default value has no effect on the behavior of your SQL question when viewed in a dashboard.**
+### Optional clauses
-##### Default value in the query
+You can make a clause optional in a query. For example, you can create an optional `WHERE` clause that contains a SQL variable, so that if no value is supplied to the variable (either in the filter or via the URL), the query will still run as if there were now `WHERE` clause.
-You can also define default values directly in your query, which are useful when defining complex default values. Note that the hash (`#`) might need to be replaced by the comment syntax of the database you're using. Some databases use double-dashes (`--`) as comment syntax.
+To make a clause optional in your native query, type `[[brackets around a {% raw %}{{variable}}{% endraw %}]]`. If you input a value in the filter widget for the `variable`, then the entire clause is placed into the template; otherwise Metabase will ignore the clause.
-Current example for a Date filter:
+In this example, if no value is given to `cat`, then the query will just select all the rows from the `products` table. But if `cat` does have a value, like "Widget", then the query will only grab the products with a category type of Widget:
```
-SELECT p.*
-FROM products p
-WHERE p.createdAt = [[ {% raw %}{{dateOfCreation}}{% endraw %} #]]CURRENT_DATE()
+SELECT count(*)
+FROM products
+[[WHERE category = {% raw %}{{cat}}{% endraw %}]]
```
-#### Connecting a SQL question to a dashboard filter
-
-In order for a saved SQL/native question to be usable with a dashboard filter, it must contain at least one field filter. The kind of dashboard filter that can be used with the SQL question depends on the field that you map to the question's field filter(s). For example, if you have a field filter called `{% raw %}{{var}}{% endraw %}` and you map it to a State field, you can map a Location dashboard filter to your SQL question. In this example, you'd create a new dashboard or go to an existing one, click the "Edit" button, add the SQL question that contains your State field filter, add a new dashboard filter or edit an existing Location filter, then click the dropdown on the SQL question card to see the State field filter. [Learn more about dashboard filters here](08-dashboard-filters.md).
-
-
-
-### Optional Clauses
-
-To make a clause optional in your native query, type `[[brackets around a {% raw %}{{variable}}{% endraw %}]]`. If `variable` is given a value, then the entire clause is placed into the template. If not, then the entire clause is ignored.
-
-In this example, if no value is given to `cat` from its filter widget or URL, then the query will just select all the rows from the `products` table. But if `cat` does have a value, like `Widget`, then the query will only grab the products with a category type of `Widget`:
+To use multiple optional clauses, you must include at least one regular `WHERE` clause followed by optional clauses, each starting with `AND`:
```
SELECT count(*)
FROM products
-[[WHERE category = {% raw %}{{cat}}{% endraw %}]]
+WHERE true
+ [[AND id = {% raw %}{{id}}{% endraw %}]]
+ [[AND {% raw %}{{category}}{% endraw %}]]
```
-Or in MongoDB:
+That last clause uses a Field filter (note the lack of a column in the `AND` clause). When using a field filter, you must exclude the column in the query; you need to map the variable in the side panel.
+
+If you're using MongoDB, you can make an clause optional like so:
```
{% raw %}
@@ -137,32 +113,170 @@ Or in MongoDB:
{% endraw %}
```
-To use multiple optional clauses you must include at least one regular `WHERE` clause followed by optional clauses, each starting with `AND`.
+Or with multiple optional filters:
-Example:
+```
+{% raw %}
+[
+ [[{ $match: {{cat}} },]]
+ [[{ $match: { price: { "$gt": {{minprice}} } } },]]
+ {
+ $count: "Total"
+ }
+]
+{% endraw %}
+```
+
+## Setting a default value in the filter widget
+
+In the variables sidebar, you can set a default value for your variable. This value will be inserted into the corresponding filter widget by default (even if the filter widget is empty). You'll need to insert a new value into the filter widget to override the default.
+
+## Setting complex default values in the query
+
+You can also define default values directly in your query, which is useful when defining complex default values (for example, using a function to generate a value).
+
+Here's an example that sets the default value of a Date filter to the current date using `CURRENT_DATE()`:
```
-SELECT count(*)
+SELECT *
FROM products
-WHERE True
- [[AND id = {% raw %}{{id}}{% endraw %}]]
- [[AND category = {% raw %}{{category}}{% endraw %}]]
+WHERE DATE(created_at) = [[ {% raw %}{{dateOfCreation}}{% endraw %} #]]CURRENT_DATE()
```
-When using a field filter, the column name should not be included in the SQL. Instead, the variable should be mapped to a field in the side panel.
+Note that the hash (`#`) used to comment the text might need to be replaced by the comment syntax specific to the database you're using. Some databases use double-dashes (`--`) as comment syntax.
+
+## The Field Filter variable type
+
+Setting a variable to the "Field Filter" type allows you to map the variable to a field in any table in the current database, and lets you create a "smart" filter widget that makes sense for that field.
-Example:
+Field Filter variables should be used inside of a `WHERE` clause in SQL, or a `$match` clause in MongoDB.
+
+### Field Filter compatible types
+
+Field Filters ONLY work with the following field types:
+
+- Category
+- Entity Name
+- Entity Key
+- Foreign Key
+- City
+- State
+- ZIP or Postal Code
+
+The field can also be a date or timestamp, which can be left as "No semantic type" in the data model.
+
+When you set the **Variable type** to "Field Filter", Metabase will present an option to set the **Field to map to**, as well as the **Filter widget type**. The options available for the Filter widget type depend on the field's type. For example, if you map to a field of type Category, you'll see options for either "Category" or None. If you map to a Date Field, you'll see options for None, Month and year, Quarter and year, Single date, Date range, or Date filter.
+
+If you're not seeing the option to display a filter widget, make sure the mapped field is set to one of the above types, and then try manually syncing your database from the "Databases" section of the Admin Panel to force Metabase to scan and cache the field's values.
+
+If you want to map a Field Filter to a field that isn't one of the compatible types listed above, you'll need an Admin to change the [field type for that column][column-types].
+
+## Field Filter syntax
+
+Let's say you want to create a Field Filter that filters the `People` table by state, and you want people to be able to select multiple states at a time. Here's the query:
+
+The syntax for Field Filters differs from a Text, Number, or Date variable.
```
-SELECT count(*)
-FROM products
-WHERE True
- [[AND {% raw %}{{id}}{% endraw %}]]
- [[AND {% raw %}{{category}}{% endraw %}]]
+SELECT *
+FROM PEOPLE
+WHERE {%raw%}{{state}}{%endraw%}
+```
+
+Then, in the side panel, select the "Field Filter" variable type, and choose which field to map your variable to (in this case, `State`).
+
+Note the lack of the column and operator (like `=`). The reason you need to structure Field Filters this way is to handle cases where Metabase generates the code for you. For example, for handling cases where someone selects multiple values in the filter widget, or a range of dates. With Field Filters, you can't control the generated SQL, so if you need greater control, you should use one (or more) Text, Number, or Date variables.
+
+A MongoDB native query example might look like this:
+
+```
+{% raw %}[ {$match: {{date_var}} } ]{% endraw %}
```
+For a more in-depth guide, check out [Field Filters: create smart filter widgets for SQL questions][field-filter].
+
+## How to create different types of filter widgets
+
+The kind of filter widget that Metabase displays when you create a Field Filter widget depends on a setting for that field in Metabase called **Filtering on this field**. Admins can set this field option to:
+
+- Plain input box
+- Search box
+- A list of all values (also known as a dropdown menu)
+
+Date fields will either have a simple date filter (for Date variables) or a dynamic date picker (for Field Filters mapped to a date field).
+
+If you want to change the filter widget for a particular field, you'll need to ask an Admin to [update that field][filtering-on-this-field] in the data model and set the desired "Filtering on this field" option.
+
+### Filter widget with plain input box
+
+Create a simple **Text** or **Number** variable. Additionally, you can use a Field Filter with a field that has its **Filtering on this field** value set to "Plain input box".
+
+Note: to guard against SQL injection attacks, Metabase converts whatever is in the Search box to a string. If you want to use wildcards, check out [our Learn article][basic-input].
+
+### Filter widget with search box
+
+- Include a SQL variable in you query.
+- Set the **Variable type** to **Field Filter**.
+- Set the **Field to map to** to a field of type "Category" that has its **Filtering on this field** option set to "Search box"
+
+### Filter widget with dropdown menu and search
+
+To create a dropdown menu with search and a list of all values, you need to:
+
+- Include a SQL variable in you query.
+- Set the **Variable type** to **Field Filter**.
+- Set the **Field to map to** to a field of type "Category" that has its **Filtering on this field** option set to "A list of all values".
+- Set the **Filter widget type** to "Category".
+
+If the field you want to create a dropdown for is not set to the type "Category" with **Filtering on this field** set to "A list of all values", an Admin will need to update the settings for that field. For example, if you want to create a dropdown menu for an incompatible field type like an Email field, an admin will need to change that field type to "Category", set the **Filtering on this field** option to **A list of all values**, then re-scan the values for that field.
+
+If however, there are too many different values in that column to display in a dropdown menu, Metabase will simply display a search box instead. So if you have a lot of email addresses, you may just get a search box anyway. The dropdown menu widgets work better when there's a small set of values to choose from (like the fifty U.S. states).
+
+## Field filter gotchas
+
+Some things that could trip you up when trying to set up a Field Filter variable:
+
+### Field filters don't work with table aliases
+
+Table aliases are not supported. The reason is that field filters generate SQL based on the mapped field; Metabase doesn't parse the SQL, so it can't tell what an alias refers to.
+
+The workaround is to either avoid aliases and use full table names, or instead use a subquery, for example, a query nested inside a SELECT statement. Alternatively, you could create a view in your database that shows the results of a complicated query, and then query that view.
+
+### Some databases require the schema in the FROM clause
+
+An example for **BigQuery**, back ticks are needed, like `` FROM `dataset.table` ``. If "Project ID (override)" is used in the connection settings, then it should be `` FROM `project.dataset.table` ``.
+
+For **Oracle** it would be `FROM "schema"."table"`.
+
+## Connecting a SQL question to a dashboard filter
+
+In order for a saved SQL/native question to be usable with a dashboard filter, the question must contain at least one variable.
+
+The kind of dashboard filter that can be used with the SQL question depends on the field. For example, if you have a field filter called `{% raw %}{{var}}{% endraw %}` and you map it to a State field, you can map a Location dashboard filter to your SQL question. In this example, you'd create a new dashboard (or go to an existing dashboard), click the __Pencil icon__ to enter __Dashboard edit mode__, add the SQL question that contains your State Field Filter variable, add a new dashboard filter (or edit an existing Location filter), then click the dropdown on the SQL question card to see the State Field Filter.
+
+If you add a **Date** variable to the question, then it's only possible to use the dashboard filter option **Single Date**. So if you are trying to use one of the other Time options on the dashboard, you'll need to change the variable to a [Field Filter](#the-field-filter-variable-type) variable and map it to a date column.
+
+
+
+More on [Dashboard filters][dashboard-filters].
+
+## Further reading
+
+- [Create filter widgets for charts using SQL variables][sql-variables].
+- [Field Filters: create smart filter widgets for SQL questions][field-filters].
+- [Troubleshooting filters][troubleshooting-filters].
+- [Dashboard filters][dashboard-filters].
---
## Next: Referencing saved questions in queries
Learn how to [refer to a saved question in a SQL query](referencing-saved-questions-in-queries.md).
+
+[sql-editor]: ./writing-sql.html
+[column-types]: ../administration-guide/03-metadata-editing.html#types
+[dashboard-filters]: 08-dashboard-filters.html
+[field-filter]: /learn/sql-questions/field-filters.html
+[filtering-on-this-field]: ../adminstration-guide/03-metadata-editing.html#picking-the-filter-user-interface-for-a-column
+[sql-variables]: /learn/sql-questions/sql-variables.html
+[troubleshooting-filters]: ../troubleshooting-guide/filters.html
+[basic-input]: /learn/sql-questions/sql-variables.html#basic-input-variable-text
diff --git a/docs/users-guide/images/sql-parameters/01-variables.png b/docs/users-guide/images/sql-parameters/01-variables.png
deleted file mode 100644
index bd9dfd8755aa774383a6bc89c484484fb1b70831..0000000000000000000000000000000000000000
Binary files a/docs/users-guide/images/sql-parameters/01-variables.png and /dev/null differ
diff --git a/docs/users-guide/images/sql-parameters/02-widget.png b/docs/users-guide/images/sql-parameters/02-widget.png
index 053e7bc56c35b9891db47eaf8f0ba43e13dc1e48..14a5954da6df28e79d067c94fb9617db59687fa8 100644
Binary files a/docs/users-guide/images/sql-parameters/02-widget.png and b/docs/users-guide/images/sql-parameters/02-widget.png differ
diff --git a/docs/users-guide/images/sql-parameters/state-field-filter.png b/docs/users-guide/images/sql-parameters/state-field-filter.png
index de256e7707b5692c81849ee80a3aa0a2378168e6..f66b4c178282a36865025dbbe9363834f08b7386 100644
Binary files a/docs/users-guide/images/sql-parameters/state-field-filter.png and b/docs/users-guide/images/sql-parameters/state-field-filter.png differ