diff --git a/src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java b/src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java
index 401a78e127e46905e59e9c84d9650d9226967c5f..e2e5d545de9a20caa92660c8888eb86ddef51306 100644
--- a/src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java
+++ b/src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java
@@ -116,6 +116,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
         strictHttpFirewall.setAllowSemicolon(true);
         return strictHttpFirewall;
     }
+
     @Override
     public void configure(WebSecurity web) {
         web
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java b/src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java
index 10881c20fe4dda74f28bf3494504df9893ffb34a..d09c6def6e1c031dab348493357e17c262e51994 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java
@@ -83,9 +83,10 @@ public class AuditEventConverter {
                     WebAuthenticationDetails authenticationDetails = (WebAuthenticationDetails) entry.getValue();
                     results.put("remoteAddress", authenticationDetails.getRemoteAddress());
                     String sessionId = authenticationDetails.getSessionId();
-                    if(sessionId==null)
-                    	sessionId = "unknown";
-					results.put("sessionId", sessionId);
+                    if (sessionId == null) {
+                        sessionId = "unknown";
+                    }
+                    results.put("sessionId", sessionId);
                 } else {
                     results.put(entry.getKey(), Objects.toString(entry.getValue()));
                 }
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/MessageService.java b/src/main/java/at/ac/uibk/gitsearch/service/MessageService.java
index 2eb3334f10991e8f0532080d3d226bd2c6e195e8..7f57fda8c40c53fd0b1042d23761da11f2e0960d 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/MessageService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/MessageService.java
@@ -36,6 +36,9 @@ public class MessageService {
     BroadCastMessageDTO[] messages = null;
 
     public BroadCastMessageDTO[] getMessages() {
+        if (messages == null) {
+            return new BroadCastMessageDTO[] {};
+        }
         return messages.clone();
     }
 
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/SearchService.java b/src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
index e48fe5a6c09b91ab251800e107f536b07ab257b7..094b3499d572f87d93f6d3e99cfff3140d3638ca 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
@@ -244,7 +244,7 @@ public class SearchService {
                 }
                 String httpUrlToRepo = metaData.getProject().getUrl();
                 String commitId = metaData.getFile().getCommit_id();
-                String baseRepoURL = httpUrlToRepo + "/-/raw/" + commitId;
+                String baseRepoURL = httpUrlToRepo + "/-/raw/" + commitId + "/";
                 final URI resolvedImageUrl = new URI(baseRepoURL).resolve(url);
                 metaData.getMetadata().setImage(resolvedImageUrl.toASCIIString());
                 return;
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/dto/BroadCastMessageDTO.java b/src/main/java/at/ac/uibk/gitsearch/service/dto/BroadCastMessageDTO.java
index 79b639788be41d95338c63dd4fea2e92d8d8becb..a049b15c6d3a3029f732e343962adc8b57472a4c 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/dto/BroadCastMessageDTO.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/dto/BroadCastMessageDTO.java
@@ -15,4 +15,5 @@ public class BroadCastMessageDTO {
     public String target_path; // "*/welcome",
     public String broadcast_type; // "banner",
     public boolean dismissable; // false
+    public int[] target_access_levels; // [10, 30]
 }
diff --git a/src/main/webapp/app/shared/service/message-service.ts b/src/main/webapp/app/shared/service/message-service.ts
index a87cc54fce553f31e43958d7ef5d592602273643..2881264f3cab4ae4a6aef9f56ccc22d7409a5da5 100644
--- a/src/main/webapp/app/shared/service/message-service.ts
+++ b/src/main/webapp/app/shared/service/message-service.ts
@@ -15,6 +15,7 @@ export interface BroadCastMessage {
   target_path: string; // "*/welcome",
   broadcast_type: string; // "banner",
   dismissable: boolean; // false
+  target_access_levels: number[];
 }
 
 /**