diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java
index 15b666ab4..90fab3e8b 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java
@@ -19,13 +19,11 @@
 package org.apache.skywalking.oap.query.graphql.resolver;
 
 import com.coxautodev.graphql.tools.GraphQLQueryResolver;
-import java.util.Collections;
-import java.util.List;
-import org.apache.skywalking.oap.query.graphql.type.TopNCondition;
-import org.apache.skywalking.oap.query.graphql.type.TopNEntity;
+import java.util.*;
+import org.apache.skywalking.oap.query.graphql.type.*;
 
 public class AggregationQuery implements GraphQLQueryResolver {
-    public List<TopNEntity> getTopN(final TopNCondition condition) {
+    public List<TopNEntity> getTopN(final TopNCondition condition, final Duration duration) {
         return Collections.emptyList();
     }
 }
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Call.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Call.java
index 774dbc18a..7a97df859 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Call.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Call.java
@@ -21,8 +21,6 @@ package org.apache.skywalking.oap.query.graphql.type;
 public class Call {
     private String source;
     private String target;
-    private boolean isAlert;
     private String callType;
     private long cpm;
-    private long avgResponseTime;
 }
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ClusterBrief.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ClusterBrief.java
index 61ff49cff..b5d20a6c4 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ClusterBrief.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ClusterBrief.java
@@ -20,7 +20,7 @@ package org.apache.skywalking.oap.query.graphql.type;
 
 public class ClusterBrief {
     private int numOfService;
-    private int numOfServiceInstance;
+    private int numOfEndpoint;
     private int numOfDatabase;
     private int numOfCache;
     private int numOfMQ;
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 ebbeb721d..149251420 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 ebbeb721d95bba8ee63bc2e706e877ee3a56433e
+Subproject commit 149251420c887552df93d5c76f67ccdd47cb71ce
diff --git a/skywalking-ui b/skywalking-ui
index f9c602936..ad3ee45db 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit f9c602936ab4f386576bf16f203efac61962e424
+Subproject commit ad3ee45dbadfae35d77238bdd7a1df593158f109