diff --git a/CHANGES.md b/CHANGES.md
index e4db0124e9..d0b9722ff8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -34,6 +34,8 @@ Release Notes.
 * Support ZGC GC time and count metric collecting.
 * Sync proto buffers files from upstream Envoy (Related to https://github.com/envoyproxy/envoy/pull/18955).
 * Bump up GraphQL related dependencies to latest versions.
+* Add `normal` to V9 service meta query.
+* Support `scope=ALL` catalog for metrics.
 
 #### UI
 
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricDefinition.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricDefinition.java
index ddd28b3f75..5964260ea1 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricDefinition.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricDefinition.java
@@ -38,7 +38,7 @@ public class MetricDefinition {
     private MetricsType type;
     /**
      * Catalog includes SERVICE_CATALOG,SERVICE_INSTANCE_CATALOG,ENDPOINT_CATALOG,
-     * SERVICE_RELATION_CATALOG,SERVICE_INSTANCE_RELATION_CATALOG_NAME,ENDPOINT_RELATION_CATALOG_NAME
+     * SERVICE_RELATION_CATALOG,SERVICE_INSTANCE_RELATION_CATALOG_NAME,ENDPOINT_RELATION_CATALOG_NAME,ALL
      */
     private String catalog;
 }
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java
index dc7d13f0fb..3ab454f86d 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java
@@ -23,14 +23,30 @@ import java.util.Set;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.skywalking.oap.server.core.analysis.IDManager;
 
-@Getter
-@Setter
 @EqualsAndHashCode
 public class Service {
+    @Getter
     private String id;
+    @Getter
+    @Setter
     private String name;
+    @Getter
+    @Setter
     private String shortName;
+    @Getter
+    @Setter
     private String group;
+    @Getter
+    private boolean normal;
+    @Getter
+    @Setter
     private Set<String> layers = new HashSet<>();
+
+    public void setId(String id) {
+        this.id = id;
+        IDManager.ServiceID.ServiceIDDefinition def = IDManager.ServiceID.analysisId(id);
+        this.normal = def.isReal();
+    }
 }
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
index 43f2fa5ef0..78d70aef46 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
@@ -306,7 +306,7 @@ public class DefaultScopeDefine {
      * Get the catalog string name of the given scope
      *
      * @param scope id of the source scope.
-     * @return literal string name of the catalog owning the scope.
+     * @return literal string name of the catalog owning the scope. Return `ALL` by default.
      */
     public static String catalogOf(int scope) {
         if (inServiceCatalog(scope)) {
@@ -327,7 +327,7 @@ public class DefaultScopeDefine {
         if (inEndpointRelationCatalog(scope)) {
             return ENDPOINT_RELATION_CATALOG_NAME;
         }
-        return "UNKNOWN";
+        return "ALL";
     }
 
     /**
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
index d9039e0176..d6e294735a 160000
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
@@ -1 +1 @@
-Subproject commit d9039e01767bc79e845bb32dbbeb6cdf74403af5
+Subproject commit d6e294735ab43b2fa9e70b11c91d85268591dec0