diff --git a/claims/claim-utils/claimHelper.class.ts b/claims/claim-utils/claimHelper.class.ts
index c6dc154c..9b914ab5 100644
--- a/claims/claim-utils/claimHelper.class.ts
+++ b/claims/claim-utils/claimHelper.class.ts
@@ -168,7 +168,7 @@ export class ShowOptions {
     this.basketShowSources = false;  
   }
   showLinkTo() {
-    console.log(this.linkTo, "showLinkTo")
+    // console.log(this.linkTo, "showLinkTo")
     this.show = this.linkTo;
     this.basketswitchToLinkTo();
     HelperFunctions.scroll();
diff --git a/claims/directLinking/directLinking.component.ts b/claims/directLinking/directLinking.component.ts
index b555d63d..e4231c19 100644
--- a/claims/directLinking/directLinking.component.ts
+++ b/claims/directLinking/directLinking.component.ts
@@ -152,6 +152,7 @@ export class DirectLinkingComponent {
        entity.type = "project";
        entity.title = project.projectName;
        entity.project = new ClaimProject();
+       entity.project.url = properties.searchLinkToProject + entity.id;
        entity.project.acronym = project.projectAcronym;
        entity.project.code = project.code;
        entity.project.endDate = project.endDate;
diff --git a/claims/linking/linkingGeneric.component.html b/claims/linking/linkingGeneric.component.html
index 2ac4e7f5..417177d0 100644
--- a/claims/linking/linkingGeneric.component.html
+++ b/claims/linking/linkingGeneric.component.html
@@ -30,9 +30,16 @@
       <breadcrumbs *ngIf="!inlineEntity" [breadcrumbs]="breadcrumbs"></breadcrumbs>
 <!--      [routerLink]="properties.searchLinkToResult.split('?')[0]"-->
 <!--      [queryParams]="routerHelper.createQueryParam('id', inlineEntity.id)"-->
-      <a *ngIf="inlineEntity"
-         [routerLink]="inlineEntity.result.url.split('?')[0]"
-         [queryParams]="routerHelper.createQueryParam(inlineEntity.result.url.split('?')[1].split('=')[0], inlineEntity.id)"
+      <a *ngIf="inlineEntity && inlineEntity.result"
+         [routerLink]="inlineEntity.result?.url.split('?')[0]"
+         [queryParams]="routerHelper.createQueryParam(inlineEntity.result?.url.split('?')[1].split('=')[0], inlineEntity.id)"
+         class="uk-button uk-button-link uk-text-transform-none uk-flex uk-flex-middle">
+        <icon name="west" [flex]="true"></icon>
+        <span class="uk-margin-small-left">Back to {{getEntityName(inlineEntity.type, false)}}</span>
+      </a>
+      <a *ngIf="inlineEntity && inlineEntity.project"
+         [routerLink]="inlineEntity.project?.url?.split('?')[0]"
+         [queryParams]="routerHelper.createQueryParam(inlineEntity.project?.url.split('?')[1].split('=')[0], inlineEntity.id)"
          class="uk-button uk-button-link uk-text-transform-none uk-flex uk-flex-middle">
         <icon name="west" [flex]="true"></icon>
         <span class="uk-margin-small-left">Back to {{getEntityName(inlineEntity.type, false)}}</span>
diff --git a/claims/linking/selected/ClaimEntityTitle.component.ts b/claims/linking/selected/ClaimEntityTitle.component.ts
index 5cc65e33..76fd338d 100644
--- a/claims/linking/selected/ClaimEntityTitle.component.ts
+++ b/claims/linking/selected/ClaimEntityTitle.component.ts
@@ -7,7 +7,7 @@ import {StringUtils} from "../../../utils/string-utils.class";
   template:
       `
   <div class="uk-grid uk-flex uk-flex-middle">
-    <span *ngIf="showIcon"  >
+    <span *ngIf="showIcon"  class="uk-flex">
               <span *ngIf=" entity.result" class="material-icons uk-text-small uk-text-meta" >insert_drive_file
               </span>
               <span *ngIf=" entity.project"