diff --git a/cpp/ql/src/Architecture/General Class-Level Information/ClassHierarchies.ql b/cpp/ql/src/Architecture/General Class-Level Information/ClassHierarchies.ql
index 04753567560..cfbb4e742e8 100644
--- a/cpp/ql/src/Architecture/General Class-Level Information/ClassHierarchies.ql	
+++ b/cpp/ql/src/Architecture/General Class-Level Information/ClassHierarchies.ql	
@@ -7,6 +7,7 @@
  * @workingset jhotdraw
  * @result succeed 48
  * @result_ondemand succeed 48
+ * @tags maintainability
  */
 import cpp
 
diff --git a/cpp/ql/src/Architecture/General Class-Level Information/HubClasses.ql b/cpp/ql/src/Architecture/General Class-Level Information/HubClasses.ql
index 727d58e2d0f..a4b1c303ea6 100644
--- a/cpp/ql/src/Architecture/General Class-Level Information/HubClasses.ql	
+++ b/cpp/ql/src/Architecture/General Class-Level Information/HubClasses.ql	
@@ -5,6 +5,7 @@
  * @kind treemap
  * @id cpp/architecture/hub-classes
  * @treemap.warnOn highValues
+ * @tags maintainability
  */
 import cpp
 
diff --git a/cpp/ql/src/Architecture/General Class-Level Information/InheritanceDepthDistribution.ql b/cpp/ql/src/Architecture/General Class-Level Information/InheritanceDepthDistribution.ql
index 2c9f0bc88c2..631f9798b2b 100644
--- a/cpp/ql/src/Architecture/General Class-Level Information/InheritanceDepthDistribution.ql	
+++ b/cpp/ql/src/Architecture/General Class-Level Information/InheritanceDepthDistribution.ql	
@@ -7,6 +7,7 @@
  * @workingset jhotdraw
  * @result succeed 48
  * @result_ondemand succeed 48
+ * @tags maintainability
  */
 import cpp
 
diff --git a/cpp/ql/src/Architecture/General Namespace-Level Information/CyclicNamespaces.ql b/cpp/ql/src/Architecture/General Namespace-Level Information/CyclicNamespaces.ql
index 2f948c1cbcb..5785e633a02 100644
--- a/cpp/ql/src/Architecture/General Namespace-Level Information/CyclicNamespaces.ql	
+++ b/cpp/ql/src/Architecture/General Namespace-Level Information/CyclicNamespaces.ql	
@@ -5,6 +5,7 @@
  * @id cpp/architecture/cyclic-namespaces
  * @graph.layout hierarchical
  * @tags maintainability
+ *       modularity
  */
 import cpp
 
diff --git a/cpp/ql/src/Architecture/General Namespace-Level Information/GlobalNamespaceClasses.ql b/cpp/ql/src/Architecture/General Namespace-Level Information/GlobalNamespaceClasses.ql
index 09a7bb30849..e3780b21c2b 100644
--- a/cpp/ql/src/Architecture/General Namespace-Level Information/GlobalNamespaceClasses.ql	
+++ b/cpp/ql/src/Architecture/General Namespace-Level Information/GlobalNamespaceClasses.ql	
@@ -3,6 +3,8 @@
  * @description Finds classes that belong to no namespace.
  * @kind table
  * @id cpp/architecture/global-namespace-classes
+ * @tags maintainability
+ *       modularity
  */
 import cpp
 
diff --git a/cpp/ql/src/Architecture/General Namespace-Level Information/NamespaceDependencies.ql b/cpp/ql/src/Architecture/General Namespace-Level Information/NamespaceDependencies.ql
index fe79f5f66b4..323ede0a7b6 100644
--- a/cpp/ql/src/Architecture/General Namespace-Level Information/NamespaceDependencies.ql	
+++ b/cpp/ql/src/Architecture/General Namespace-Level Information/NamespaceDependencies.ql	
@@ -4,6 +4,8 @@
  * @kind graph
  * @id cpp/architecture/namespace-dependencies
  * @graph.layout hierarchical
+ * @tags maintainability
+ *       modularity
  */
 import cpp
 
diff --git a/cpp/ql/src/Architecture/General Top-Level Information/GeneralStatistics.ql b/cpp/ql/src/Architecture/General Top-Level Information/GeneralStatistics.ql
index 10a560d2836..f332e0de316 100644
--- a/cpp/ql/src/Architecture/General Top-Level Information/GeneralStatistics.ql	
+++ b/cpp/ql/src/Architecture/General Top-Level Information/GeneralStatistics.ql	
@@ -3,6 +3,7 @@
  * @description Shows general statistics about the application.
  * @kind table
  * @id cpp/architecture/general-statistics
+ * @tags maintainability
  */
 import cpp