diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/SearchController.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/SearchController.java
index 79450ce2..c52b5e5f 100644
--- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/SearchController.java
+++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/SearchController.java
@@ -52,12 +52,14 @@ public class SearchController {
             @RequestParam(required = false) String agentId,
             @RequestParam(required = false) String processorType,
             @RequestParam(required = false) String application,
+            @RequestParam(required = false) String group,
             @RequestParam(defaultValue = "0") int offset,
             @RequestParam(defaultValue = "50") int limit,
             @RequestParam(required = false) String sortField,
             @RequestParam(required = false) String sortDir) {
 
-        List<String> agentIds = resolveApplicationToAgentIds(application);
+        String app = application != null ? application : group;
+        List<String> agentIds = resolveApplicationToAgentIds(app);
 
         SearchRequest request = new SearchRequest(
                 status, timeFrom, timeTo,
@@ -65,7 +67,7 @@ public class SearchController {
                 correlationId,
                 text, null, null, null,
                 routeId, agentId, processorType,
-                application, agentIds,
+                app, agentIds,
                 offset, limit,
                 sortField, sortDir
         );
@@ -92,9 +94,10 @@ public class SearchController {
             @RequestParam Instant from,
             @RequestParam(required = false) Instant to,
             @RequestParam(required = false) String routeId,
-            @RequestParam(required = false) String application) {
+            @RequestParam(required = false) String application,
+            @RequestParam(required = false) String group) {
         Instant end = to != null ? to : Instant.now();
-        List<String> agentIds = resolveApplicationToAgentIds(application);
+        List<String> agentIds = resolveApplicationToAgentIds(application != null ? application : group);
         if (routeId == null && agentIds == null) {
             return ResponseEntity.ok(searchService.stats(from, end));
         }
@@ -108,9 +111,10 @@ public class SearchController {
             @RequestParam(required = false) Instant to,
             @RequestParam(defaultValue = "24") int buckets,
             @RequestParam(required = false) String routeId,
-            @RequestParam(required = false) String application) {
+            @RequestParam(required = false) String application,
+            @RequestParam(required = false) String group) {
         Instant end = to != null ? to : Instant.now();
-        List<String> agentIds = resolveApplicationToAgentIds(application);
+        List<String> agentIds = resolveApplicationToAgentIds(application != null ? application : group);
         if (routeId == null && agentIds == null) {
             return ResponseEntity.ok(searchService.timeseries(from, end, buckets));
         }