diff --git a/src/main/docker/gitsearch.yml b/src/main/docker/gitsearch.yml
index 15c657659e121629d754728ae1cd89ab1c0d0ba6..6f88f303c71c429fbf2d9531ac3faa85a841136b 100644
--- a/src/main/docker/gitsearch.yml
+++ b/src/main/docker/gitsearch.yml
@@ -1,7 +1,7 @@
 version: '3.5'
 services:
   gitsearch-app:
-    image: gitsearch:latest
+    image: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/gitsearch
     container_name: sharing_search
     hostname: sharing_search
     environment:
diff --git a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html
index c45e9e284a4caf89915cd88bc9137dd3e303ebea..d8df9c4968fc4027d9b95e9869dc1be318126a7e 100644
--- a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html
+++ b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html
@@ -116,7 +116,7 @@
   <jhi-exercise-metadata-item
     [description]="'exercise.metadata.internalIdentifier'"
     [value]="exercise.originalResult.exerciseId"
-    link="/item/{{ exercise.originalResult.exerciseId }}"
+    link="/item/{{ encodeURIforExerciseId(exercise.originalResult.exerciseId) }}"
   >
   </jhi-exercise-metadata-item>
 
diff --git a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts
index be1bff63cb298413b4f3acf6b4ff6b5ad9348a2f..4d276205bc9673af80ebdc2accbc8c215397b069 100644
--- a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts
+++ b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit, OnDestroy, Input } from '@angular/core';
 import { Exercise } from 'app/shared/model/exercise.model';
+import { encodeURIforExerciseId } from 'app/exercise/service/exercise.service';
+
 import { Person } from 'app/shared/model/person.model';
 import { Subscription } from 'rxjs';
 import { Account } from 'app/core/auth/account.model';
@@ -14,6 +16,8 @@ export class ExerciseMetadataComponent implements OnInit, OnDestroy {
   @Input() exercise: Exercise | undefined;
   account: Account | null = null;
   authSubscription?: Subscription;
+  
+  encodeURIforExerciseId = encodeURIforExerciseId; // just make it available for template
 
   constructor(private accountService: AccountService) {}
 
diff --git a/src/main/webapp/app/exercisePage/exercise.route.ts b/src/main/webapp/app/exercisePage/exercise.route.ts
index fc178b887850fb38ca11b77a040554713556cd97..c97a26260688d4193e4b2665967457a53a2aab32 100644
--- a/src/main/webapp/app/exercisePage/exercise.route.ts
+++ b/src/main/webapp/app/exercisePage/exercise.route.ts
@@ -13,7 +13,7 @@ export class ExerciseResolve implements Resolve<String> {
       subUrl += route.url[i].path;
       verkett = '/';
     }
-    if (subUrl === '') return of('helpStart');
+    if (subUrl === '') return of('');
     return of(subUrl);
   }
 }