diff --git a/claims/claim-utils/claimResultSearchForm.component.html b/claims/claim-utils/claimResultSearchForm.component.html
index 8920fe71..72baca83 100644
--- a/claims/claim-utils/claimResultSearchForm.component.html
+++ b/claims/claim-utils/claimResultSearchForm.component.html
@@ -94,7 +94,7 @@
                       </div>
              </div>
            </div>
-
+         </div>
          <div  *ngIf="activeTab == 'datacite'" id="datacite" class="uk-animation-fade">
            <div *ngIf="dataciteStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img src="./assets/loading.gif" class="uk-align-center" alt="Loading"></div>
            <div *ngIf="dataciteStatus == errorCodes.NONE" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
@@ -123,7 +123,7 @@
                 </div>
               </div>
               <div >
-              <claim-results *ngIf="openaireData.length > 0 "  [(results)]=openaireData [(selectedResults)]=selectedResults > </claim-results>
+              <claim-results [(results)]=openaireData [(selectedResults)]=selectedResults > </claim-results>
              </div>
            </div>
       </div>
@@ -138,10 +138,9 @@
             <paging-no-load [currentPage]="openaireSoftwarePage" [totalResults]="openaireSoftwareNum"   [term]="keyword" [size]="size"  (pageChange)="openaireSoftwarePageChange($event)"> </paging-no-load>
             </div>
           </div>
-          <div >
-
-          <claim-results *ngIf="openaireSoftware.length > 0 "  [(results)]=openaireSoftware [(selectedResults)]=selectedResults > </claim-results>
-         </div>
+          <div>
+            <claim-results [(results)]=openaireSoftware [(selectedResults)]=selectedResults > </claim-results>
+           </div>
        </div>
   </div>
     </div>
diff --git a/claims/claim-utils/claimResultSearchForm.component.ts b/claims/claim-utils/claimResultSearchForm.component.ts
index aa31051c..608568fb 100644
--- a/claims/claim-utils/claimResultSearchForm.component.ts
+++ b/claims/claim-utils/claimResultSearchForm.component.ts
@@ -594,18 +594,17 @@ openaireSoftwarePageChange($event) {
          for(var i=0; i< data.length; i++){
            var item = data[i];
            var result: ClaimResult  = new ClaimResult();
-           result.publisher =  null;
+           result.publisher =   (item.publisher && item.publisher != "")?item.publisher:null;
            result.journal =  null;
            result.DOI = null;
            result.id = item.id;
            result.title = item.title.name;
            result.url = item.title.url;
            result.source = "openaire";
-           result.date = item.year;
+           result.date = (item.year && item.year != "")?item.year:null;
            result.accessRights = item.title.accessMode;
-           console.log(item);
            result.type = type;
-
+           result.embargoEndDate = (item.embargoEndDate && item.embargoEndDate != "")?item.embargoEndDate:null;
            result.publisher = item.publisher;
            result.result = item;
            if(item.authors){
diff --git a/claims/claim-utils/claimResults.component.ts b/claims/claim-utils/claimResults.component.ts
index b121fdf7..15d5015a 100644
--- a/claims/claim-utils/claimResults.component.ts
+++ b/claims/claim-utils/claimResults.component.ts
@@ -22,7 +22,8 @@ declare var UIkit:any;
         <span  *ngIf="result.journal!=null" class="uk-article-meta">Journal: {{result.journal}}</span><span *ngIf="(result.date)" class="uk-article-meta"> ({{result.date}})</span>
         <div *ngIf="result.authors && result.authors.length >0 " class="uk-article-meta">Authors: <span *ngFor="let author of result.authors.slice(0,10) let i = index">{{author}}{{(i < (result.authors.slice(0,10).length-1))?"; ":""}}{{(i == result.authors.slice(0,10).length-1 && result.authors.length > 10)?"...":""}}</span></div>
         <div *ngIf="result.editors && result.editors.length > 0" class="uk-article-meta">Editors: <span *ngFor="let author of result.editors.slice(0,10)  let i = index">{{author}}{{(i < (result.authors.slice(0,10).length-1))?"; ":""}}{{(i == result.authors.slice(0,10).length-1 && result.authors.length > 10)?"...":""}}</span></div>
-      </li>`,
+      </li>
+      </ul>`,
 
 })
 export class ClaimResultsComponent {