diff --git a/events/src/main/java/ba/steleks/controller/EventController.java b/events/src/main/java/ba/steleks/controller/EventController.java
index 9a8b8a4..cd81fb3 100644
--- a/events/src/main/java/ba/steleks/controller/EventController.java
+++ b/events/src/main/java/ba/steleks/controller/EventController.java
@@ -61,14 +61,18 @@ public class EventController {
     @RequestMapping(path = "/events", method = RequestMethod.GET)
     public ResponseEntity<?> getEventsById(@RequestParam(required = false) Long typeId) {
         Iterable<Event> result;
-        if(typeId == null) {
+        if (typeId == null) {
             result = repository.findAll();
         } else {
             result = repository.findByEventTypeId(typeId);
         }
         return ResponseEntity
                 .status(HttpStatus.OK)
-                .body(new Object() { public Object _embedded = result;});
+                .body(new Object() {
+                    public Object _embedded = new Object() {
+                        public Object events = result;
+                    };
+                });
     }
 
 }