diff --git a/docs b/docs
index 4752b523..f7b734d7 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 4752b523231a11e4cf7c0b8ecf2ff035f775ae4a
+Subproject commit f7b734d7665095746a36d5332a835d9c4a78a6a0
diff --git a/platformio/commands/boards.py b/platformio/commands/boards.py
index 7d15df2f..e7e2ecd6 100644
--- a/platformio/commands/boards.py
+++ b/platformio/commands/boards.py
@@ -32,7 +32,10 @@ def cli(query, installed, json_output):  # pylint: disable=R0912
 
     grpboards = {}
     for board in _get_boards(installed):
-        if query and not any(query.lower() in board[k] for k in ("id", "name")):
+        if query and not any(
+            query.lower() in str(board.get(k, "")).lower()
+            for k in ("id", "name", "mcu", "vendor", "platform", "frameworks")
+        ):
             continue
         if board["platform"] not in grpboards:
             grpboards[board["platform"]] = []