diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html
index d77498b3..c8c19bdc 100644
--- a/landingPages/organization/organization.component.html
+++ b/landingPages/organization/organization.component.html
@@ -35,7 +35,7 @@
                 </a>
               </li>
               <!-- Country -->
-              <li *ngIf="organizationInfo.country">
+              <li *ngIf="organizationInfo.country && !organizationInfo.country.toLowerCase().includes('unknown')">
                 <span class="uk-text-muted">Country: </span>{{organizationInfo.country}}
               </li>
             </ul>
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index cffabca4..207820de 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -168,8 +168,8 @@
                       <ul class="uk-list organizations uk-margin-remove-top">
                         <li *ngFor="let organization of (showAll?resultLandingInfo.organizations:resultLandingInfo.organizations.slice(0,3))">
                           <a [routerLink]="properties.searchLinkToOrganization.split('?')[0]" [queryParams]="{organizationId: organization.id}">
-                            {{(organization.name ? organization.name : (organization.shortname?organization.shortname:'No title available'))}}
-                            <span *ngIf="organization.shortname">({{organization.shortname}})</span>
+                            {{(organization.name ? organization.name : (organization.shortname?organization.shortname:'[No title available]'))}}
+                            <span *ngIf="!organization.name && organization.shortname">({{organization.shortname}})</span>
                           </a>
                           <div *ngIf="organization.country && !organization.country.toLowerCase().includes('unknown')">{{organization.country}}</div>
                         </li>
diff --git a/searchPages/searchOrganizations.component.ts b/searchPages/searchOrganizations.component.ts
index 43c88c4c..197ac570 100644
--- a/searchPages/searchOrganizations.component.ts
+++ b/searchPages/searchOrganizations.component.ts
@@ -85,7 +85,8 @@ export class SearchOrganizationsComponent {
         this.properties= data.envSpecific;
         if (!this.simpleSearchLink) {
           this.simpleSearchLink = this.properties.searchLinkToOrganizations;
-        }        this.advancedSearchLink = this.properties.searchLinkToAdvancedOrganizations;
+        }
+        this.advancedSearchLink = this.properties.searchLinkToAdvancedOrganizations;
         this.searchUtils.baseUrl = (this.simpleView)?this.simpleSearchLink:this.advancedSearchLink;
         this.pagingLimit = data.envSpecific.pagingLimit;
         this.isPiwikEnabled = data.envSpecific.enablePiwikTrack;
diff --git a/services/organization.service.ts b/services/organization.service.ts
index 728179c0..087f9060 100644
--- a/services/organization.service.ts
+++ b/services/organization.service.ts
@@ -68,7 +68,7 @@ export class OrganizationService {
 
             this.organizationInfo.name = organization.legalname;
 
-            if(this.organizationInfo.title.name == '') {
+            if(!this.organizationInfo.title.name || this.organizationInfo.title.name == '') {
                 this.organizationInfo.title.name = this.organizationInfo.name;
             }
 
diff --git a/services/searchOrganizations.service.ts b/services/searchOrganizations.service.ts
index 5dc545fe..0d185468 100644
--- a/services/searchOrganizations.service.ts
+++ b/services/searchOrganizations.service.ts
@@ -95,7 +95,7 @@ export class SearchOrganizationsService {
             result['title'] = {"name": '', "accessMode": '', "sc39": ''};
 
             result['title'].name = resData.legalshortname;
-            if(result['title'].name == '') {
+            if(!result['title'].name || result['title'].name == '') {
                 result['title'].name = resData.legalname;
             }
 
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 764e5b59..741deff9 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -107,8 +107,8 @@
           title="Open Access mandate for Publications and Research Data">
           Open Access mandate for Publications and Research Data
   </span>{{' '}}
-  <span *ngIf="result.languages && removeUnknown(result.languages).length > 0">
-    <span *ngFor="let language of removeUnknown(result.languages)"
+  <span *ngIf="result.languages && result.languages.length > 0">
+    <span *ngFor="let language of result.languages"
           class="uk-label custom-label label-language " title="Language">
       {{language}}
     </span>{{' '}}
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index 11df326b..8eb52a46 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -49,6 +49,12 @@ export class ResultPreviewComponent implements OnInit{
       this.url = properties.searchLinkToResult.split('?')[0];
     }
     this.initBeforeTitle();
+    if(this.result.languages) {
+      this.result.languages = this.removeUnknown(this.result.languages);
+    }
+    if(this.result.countries) {
+      this.result.countries = this.removeUnknown(this.result.countries);
+    }
   }
   
   public initBeforeTitle() {
diff --git a/utils/result-preview/result-preview.ts b/utils/result-preview/result-preview.ts
index a45d82c5..267450f8 100644
--- a/utils/result-preview/result-preview.ts
+++ b/utils/result-preview/result-preview.ts
@@ -246,6 +246,7 @@ export class ResultPreview {
   
   public static organizationInfoConvert(result: OrganizationInfo): ResultPreview {
     let resultPreview: ResultPreview = new ResultPreview();
+    console.log(result);
     if(result.title && result.title.name) {
       resultPreview.title = result.title.name;
       if(result.name) {