diff --git a/explore/src/app/fos/fos.component.html b/explore/src/app/fos/fos.component.html
index aca460f5..62edfbfd 100644
--- a/explore/src/app/fos/fos.component.html
+++ b/explore/src/app/fos/fos.component.html
@@ -8,7 +8,7 @@
 	<div class="uk-grid uk-grid-large uk-grid-stack uk-padding-small" uk-grid>
 		<div class="uk-width-3-5@m uk-width-1-1@s uk-flex uk-flex-column uk-flex-center">
       <span class="uk-align-left uk-margin-remove-bottom">
-        <span uk-scrollspy-class class="uk-badge beta">Beta</span>
+        <span uk-scrollspy-class class="uk-text-large" style="color: #EEB204">Beta</span>
       </span>
 			<div style="max-width: 600px;">
         <h1 uk-scrollspy-class class="uk-h1 uk-margin-remove-top">
@@ -81,7 +81,7 @@
 				<div *ngIf="fos[index]" class="uk-width-3-4">
 					<div class="uk-text-capitalize">
 						<h2 class="uk-h4 uk-margin-remove">
-							<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: fos[index].id}"
+							<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(fos[index].id)}"
 								class="uk-link-text">
 								{{fos[index].id}}
 							</a>
@@ -91,13 +91,13 @@
 						<div *ngFor="let child of fos[index].children">
 							<div class="whole-child uk-text-capitalize">
 								<h3 class="uk-h6 uk-margin-small-bottom">
-									<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: child.id}"
+									<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(child.id)}"
 										class="uk-link-text">
 										{{child.id}}
 									</a>
 								</h3>
 								<div *ngFor="let subChild of child.children" style="margin-bottom: 5px;">
-									<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: subChild.id}"
+									<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(subChild.id)}"
 										class="uk-link-text">
 										{{subChild.id}}
 									</a>
@@ -115,19 +115,19 @@
 				<div
 					class="uk-margin-large-bottom uk-padding uk-padding-remove-top uk-padding-remove-horizontal uk-text-capitalize custom-bottom-border">
 					<h2 class="uk-h4 uk-margin-remove">
-						<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: item.id}"
+						<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(item.id)}"
 							class="uk-link-text" [innerHTML]="highlightKeyword(item.id)">
 						</a>
 					</h2>
 					<div class="uk-grid uk-child-width-1-3 uk-margin-large-top uk-margin-medium-bottom" uk-grid="masonry: false">
 						<div *ngFor="let subItem of item.children">
 							<h3 class="uk-h6 uk-margin-small-bottom">
-								<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: subItem.id}"
+								<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(subItem.id)}"
 									class="uk-link-text" [innerHTML]="highlightKeyword(subItem.id)">
 								</a>
 							</h3>
 							<div *ngFor="let subSubItem of subItem.children" style="margin-bottom: 5px;">
-								<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'fos', fv0: subSubItem.id}"
+								<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(subSubItem.id)}"
 									class="uk-link-text" [innerHTML]="highlightKeyword(subSubItem.id)">
 								</a>
 							</div>
diff --git a/explore/src/app/fos/fos.component.ts b/explore/src/app/fos/fos.component.ts
index 4311f3c2..b3c6c778 100644
--- a/explore/src/app/fos/fos.component.ts
+++ b/explore/src/app/fos/fos.component.ts
@@ -8,6 +8,7 @@ import {properties} from "src/environments/environment";
 import {FormBuilder, FormControl} from "@angular/forms";
 import {ActivatedRoute} from "@angular/router";
 import {Location} from "@angular/common";
+import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
 
 @Component({
 	selector: 'fos',
@@ -135,4 +136,8 @@ export class FosComponent implements OnInit, OnDestroy {
 		this.keywordControl.setValue('');
 		this.location.go(window.location.pathname);
 	}
-}
+
+  public urlEncodeAndQuote(str: string): string {
+    return StringUtils.quote(StringUtils.URIEncode(str));
+  }
+}
\ No newline at end of file
diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary
index 5e11488c..f974e91c 160000
--- a/explore/src/app/openaireLibrary
+++ b/explore/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 5e11488c8ff49da0675ce58924a415964aefd968
+Subproject commit f974e91c25868f3cca8842b3a6c39cdb1e6053f1
diff --git a/explore/src/app/sdg/sdg.component.html b/explore/src/app/sdg/sdg.component.html
index 921cd126..67624514 100644
--- a/explore/src/app/sdg/sdg.component.html
+++ b/explore/src/app/sdg/sdg.component.html
@@ -8,7 +8,7 @@
 	<div class="uk-grid uk-grid-large uk-grid-stack uk-padding-small" uk-grid>
 		<div class="uk-width-3-5@m uk-width-1-1@s uk-flex uk-flex-column uk-flex-center">
       <span class="uk-align-left uk-margin-remove-bottom">
-        <span uk-scrollspy-class class="uk-badge beta">Beta</span>
+        <span uk-scrollspy-class class="uk-text-large" style="color: #EEB204">Beta</span>
       </span>
       <h1 uk-scrollspy-class class="uk-h1 uk-margin-remove-top">
         <span>Science for UN Sustainable <br> Development Goals<span class="custom-sdg-dot"></span></span>
@@ -44,7 +44,7 @@
 	<div *ngIf="!loading">
 		<div *ngIf="displayedSdgs && displayedSdgs.length" class="uk-padding-small uk-margin-auto@m uk-grid uk-child-width-1-4@xl uk-child-width-1-4@l uk-child-width-1-3@m uk-child-width-1-2@s" uk-grid>
 			<div *ngFor="let sdg of displayedSdgs">
-				<a [routerLink]="properties.searchLinkToAdvancedResults" [queryParams]="{f0: 'sdg', fv0: sdg.id}"
+        <a [routerLink]="properties.searchLinkToResults" [queryParams]="{'sdg': urlEncodeAndQuote(sdg.id)}"
 					class="uk-link-reset">
 					<div class="uk-card uk-card-default uk-card-hover" [class]="'sdg-card sdg-' + sdg.code">
 						<div class="uk-height-1-1 uk-flex uk-flex-column uk-flex-between">
diff --git a/explore/src/app/sdg/sdg.component.ts b/explore/src/app/sdg/sdg.component.ts
index 304f6125..6e9f7980 100644
--- a/explore/src/app/sdg/sdg.component.ts
+++ b/explore/src/app/sdg/sdg.component.ts
@@ -7,6 +7,7 @@ import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"
 import {properties} from "src/environments/environment";
 import {RefineFieldResultsService} from "../openaireLibrary/services/refineFieldResults.service";
 import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields";
+import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
 
 @Component({
 	selector: 'sdg',
@@ -54,4 +55,8 @@ export class SdgComponent implements OnInit, OnDestroy {
       sub.unsubscribe();
     }
   }
+
+  public urlEncodeAndQuote(str: string): string {
+    return StringUtils.quote(StringUtils.URIEncode(str));
+  }
 }
\ No newline at end of file
diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme
index accd757b..b425623f 160000
--- a/explore/src/assets/openaire-theme
+++ b/explore/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit accd757bca96e58296a5ab4863bddae73e650aba
+Subproject commit b425623fb92df9d99221ab8e2f466935f1acc670