diff --git a/source/_docs/organizing/filtering.markdown b/source/_docs/organizing/filtering.markdown
index 97aea10bfbf..d8fa65532d7 100644
--- a/source/_docs/organizing/filtering.markdown
+++ b/source/_docs/organizing/filtering.markdown
@@ -16,7 +16,7 @@ related:
     title: Enabling or disabling entities and automations
 ---
 
-When working with tables, you can select multiple elements to apply an action on multiple items at once. If you have [grouped](/docs/organizing/) your assets by assigning them to floors, areas, labels, or directories you can also filter your data accordingly.
+When working with tables, you can select multiple items to apply an action. If you have [grouped](/docs/organizing/) items by assigning them to floors, areas, labels, or directories, you can also filter your data accordingly.
 
 ## Selecting multiple items in a table
 
@@ -40,6 +40,7 @@ You can filter a table so that only items matching certain criteria are shown.
 
 2. In the filters panel, select your filter criteria.
    - You can filter for [floors](/docs/organizing/floors/), [areas](/docs/organizing/areas/), [labels](/docs/organizing/labels/), and [categories](/docs/organizing/categories/) if you have previously defined them.
+   - The list of available criteria depends on the type of table.
 
     ![Screenshots showing the filter panel that tables can have, allowing you to easily find what you are looking for](/images/organizing/filter-panel.png)
 
@@ -49,8 +50,13 @@ You can group items in a table according to certain criteria. The number of show
 
 1. In the top right above the table, select the **Group by** button.
 2. The items will be grouped according to the criteria you chose.
-   - In the example, the items are grouped by manufacturer.
+   - The list of available criteria depends on the type of table.
+     - The example shows a list of devices, grouped by manufacturer.
+     - In contrast, the entities table does not allow grouping by manufacturer, but by entity domains.
 
     ![Select the Group by button](/images/organizing/table_group_01.png)
 
 3. To sort the items, select the **Sort by** button.
+4. To get a better overview, you can collapse groups in the list.
+
+    ![Collapse groups](/images/organizing/table_group_collapse.png)
\ No newline at end of file
diff --git a/source/images/organizing/table_group_collapse.png b/source/images/organizing/table_group_collapse.png
new file mode 100644
index 00000000000..c8cdfdf83d8
Binary files /dev/null and b/source/images/organizing/table_group_collapse.png differ