diff --git a/data/telegraf_plugin_filters.yml b/data/telegraf_plugin_filters.yml
index 25e350f52..6f5833eea 100644
--- a/data/telegraf_plugin_filters.yml
+++ b/data/telegraf_plugin_filters.yml
@@ -5,6 +5,14 @@ filters:
       - Output
       - Aggregator
       - Processor
+  - category: Plugin category
+    values:
+      - System
+      - Application
+      - Network
+      - Messaging
+      - Databases
+      - Containers
   - category: Operating system
     values:
       - Linux
diff --git a/data/telegraf_plugins.yml b/data/telegraf_plugins.yml
index a0a5c5aa2..6efb07a40 100644
--- a/data/telegraf_plugins.yml
+++ b/data/telegraf_plugins.yml
@@ -12,7 +12,7 @@ input:
       using the ActiveMQ Console API.
     link: https://github.com/influxdata/telegraf/blob/release-1.10/plugins/inputs/activemq/README.md
     introduced: 1.8.0
-    tags: [linux, macos]
+    tags: [linux, macos, windows, messaging]
 
   - name: Aerospike
     id: aerospike
@@ -21,7 +21,7 @@ input:
       and  statistics for all configured namespaces.
     link: https://github.com/influxdata/telegraf/blob/release-1.10/plugins/inputs/aerospike/README.md
     introduced: 0.2.0
-    tags: [linux, macos]
+    tags: [linux, macos, windows, databases]
 
   - name: Amazon CloudWatch Statistics
     id: cloudwatch