diff --git a/smp-angular/src/app/common/search-table/search-table.component.ts b/smp-angular/src/app/common/search-table/search-table.component.ts
index ce94644e28ddfde4cdbac44bb2e1049becef49cd..821648863b7d4cbca5b60b3ad75761d8a7bcbcb0 100644
--- a/smp-angular/src/app/common/search-table/search-table.component.ts
+++ b/smp-angular/src/app/common/search-table/search-table.component.ts
@@ -79,8 +79,8 @@ export class SearchTableComponent implements OnInit {
     this.columnActions = {
       cellTemplate: this.rowActions,
       name: 'Actions',
-      width: 80,
-      maxWidth:80,
+      width: 120,
+      maxWidth:150,
       sortable: false
     };
     this.columnExpandDetails= {
diff --git a/smp-angular/src/main/resources/META-INF/web-fragment.xml b/smp-angular/src/main/resources/META-INF/web-fragment.xml
index c0497c9f2fb181dfce7a75642243c151812473ba..11e584bd0107d040a00a03f78c130e0e0fa87f1a 100644
--- a/smp-angular/src/main/resources/META-INF/web-fragment.xml
+++ b/smp-angular/src/main/resources/META-INF/web-fragment.xml
@@ -8,9 +8,9 @@
 
   <distributable/>
   <ordering>
-    <before>
+    <after>
       <others/>
-    </before>
+    </after>
   </ordering>
 
 </web-fragment>
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java
index df2a63afc0c9414d29efa61711e02f8878f5e2cb..f941d6f161af8843a9c23f2d67141afb6bd50417 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java
@@ -153,6 +153,7 @@ public abstract class BaseDao<E extends BaseEntity> {
             }
         }
 
+
         // set order by
         if (searchParams != null) {
             List<Predicate> lstPredicate = createPredicates(searchParams, om, cb);
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpWebAppConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpWebAppConfig.java
index f896be40f33e516935cd8ac3dc79e78f995bff2b..d496bb6c9a1557714d88ab5ee22927d26b923e09 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpWebAppConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpWebAppConfig.java
@@ -49,8 +49,7 @@ public class SmpWebAppConfig implements WebMvcConfigurer {
 
         registry.setOrder(HIGHEST_PRECEDENCE)
                 .addResourceHandler("/index.html", "/favicon-16x16.png").addResourceLocations("/static_resources/");
-        registry.setOrder(HIGHEST_PRECEDENCE-1)
-                .addResourceHandler("/ui/").addResourceLocations("/ui/index.html"); // ui mapping to index.html
+
         registry.setOrder(HIGHEST_PRECEDENCE-2)
                 .addResourceHandler("/ui/rest/").addResourceLocations("/"); // ui rest resources
         registry.setOrder(HIGHEST_PRECEDENCE-3)
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupController.java
index 22aef46954e7b2dd42b4f66444622f6cb8fa13d7..78003e7c8e09356e7b7b39a4be2cc7403e97f0c6 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupController.java
@@ -46,6 +46,7 @@ import java.util.List;
 import static eu.europa.ec.edelivery.smp.controllers.WebConstans.HTTP_PARAM_DOMAIN;
 import static eu.europa.ec.edelivery.smp.controllers.WebConstans.HTTP_PARAM_OWNER;
 import static eu.europa.ec.smp.api.Identifiers.asParticipantId;
+import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
 import static org.springframework.http.ResponseEntity.created;
 import static org.springframework.http.ResponseEntity.ok;
 
@@ -55,7 +56,6 @@ import static org.springframework.http.ResponseEntity.ok;
 
 @RestController
 @RequestMapping("/{serviceGroupId}")
-@Order
 public class ServiceGroupController {
 
     private static final SMPLogger LOG = SMPLoggerFactory.getLogger(ServiceGroupController.class);
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/ServiceGroupResource.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/ServiceGroupResource.java
index 4aa56f86ecbcc16e7306fee6112109cb4a62265f..f28b7c3dc531d8414551d4f32d7c302ac02b5e87 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/ServiceGroupResource.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/ServiceGroupResource.java
@@ -40,7 +40,7 @@ public class ServiceGroupResource {
             @RequestParam(value = "orderType", defaultValue = "asc", required = false) String orderType,
             @RequestParam(value = "participantId", required = false) String participantId,
             @RequestParam(value = "participantSchema", required = false) String participantSchema,
-            @RequestParam(value = "domain", required = true) String domain
+            @RequestParam(value = "domain", required = false) String domain
             ) {