diff --git a/plugins/restful/group_config_handle.c b/plugins/restful/group_config_handle.c
index 3f185fa99..00b66880d 100644
--- a/plugins/restful/group_config_handle.c
+++ b/plugins/restful/group_config_handle.c
@@ -406,10 +406,16 @@ void handle_grp_subscribes(nng_aio *aio)
     NEU_PROCESS_HTTP_REQUEST_VALIDATE_JWT(
         aio, neu_json_subscribe_groups_req_t,
         neu_json_decode_subscribe_groups_req, {
-            int ret = send_subscribe_groups(aio, req);
-            if (0 != ret) {
+            int ret = 0;
+            if (req->n_group == 0) {
                 NEU_JSON_RESPONSE_ERROR(
                     ret, { neu_http_response(aio, ret, result_error); });
+            } else {
+                ret = send_subscribe_groups(aio, req);
+                if (0 != ret) {
+                    NEU_JSON_RESPONSE_ERROR(
+                        ret, { neu_http_response(aio, ret, result_error); });
+                }
             }
         })
 }
diff --git a/src/core/manager_internal.c b/src/core/manager_internal.c
index e3544acbe..086ac77c0 100644
--- a/src/core/manager_internal.c
+++ b/src/core/manager_internal.c
@@ -396,8 +396,8 @@ UT_array *neu_manager_get_driver_groups(neu_manager_t *manager, const char *app,
         neu_resp_driver_subscribe_info_t info = { 0 };
 
         if (name != NULL && strlen(name) > 0) {
-            if (strcmp(grp->driver, name) == 0 ||
-                strcmp(grp->group, name) == 0) {
+            if (strstr(grp->driver, name) != NULL ||
+                strstr(grp->group, name) != NULL) {
                 strcpy(info.app, app);
                 strcpy(info.driver, grp->driver);
                 strcpy(info.group, grp->group);