diff --git a/frontend/src/app/ui/description/listing/description-listing.component.html b/frontend/src/app/ui/description/listing/description-listing.component.html
index 176374f61..426d36565 100644
--- a/frontend/src/app/ui/description/listing/description-listing.component.html
+++ b/frontend/src/app/ui/description/listing/description-listing.component.html
@@ -27,7 +27,7 @@
 					</button>
 				</div>
 			</div>
-			<div *ngIf="hasLoadedListingItems && (hasListingItems || hasFilters)"
+			<div *ngIf="hasLoadedListingItems && (hasListingItems || hasFilters) && !isPublic"
 				class="filter-btn" [style.right]="dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="listingItems.length > 2 ? '57px' : '37px'" (click)="openFiltersDialog()">
 				<button mat-raised-button class="p-0" [matBadge]="filtersCount" [matBadgeHidden]="!hasFilters" matBadgePosition="before">
 					<mat-icon class="mr-4 filter-icon">filter_alt</mat-icon>
diff --git a/frontend/src/app/ui/description/listing/description-listing.component.ts b/frontend/src/app/ui/description/listing/description-listing.component.ts
index 851f525d9..434e5f530 100644
--- a/frontend/src/app/ui/description/listing/description-listing.component.ts
+++ b/frontend/src/app/ui/description/listing/description-listing.component.ts
@@ -163,9 +163,11 @@ export class DescriptionListingComponent extends BaseListingComponent<BaseDescri
 				this.onPageLoad({ offset: this.lookup.page.offset / this.lookup.page.size } as PageLoadEvent);
 			});
 
-		this._loadUserTenants().pipe(takeUntil(this._destroyed)).subscribe( tenants => {
-			this.tenants = tenants;
-		});
+		if (!this.isPublic){
+			this._loadUserTenants().pipe(takeUntil(this._destroyed)).subscribe( tenants => {
+				this.tenants = tenants;
+			});
+		}
 
 		this.formGroup.get('like').valueChanges
 			.pipe(takeUntil(this._destroyed), debounceTime(500))
diff --git a/frontend/src/app/ui/plan/listing/plan-listing.component.html b/frontend/src/app/ui/plan/listing/plan-listing.component.html
index 33707463c..c38dd6887 100644
--- a/frontend/src/app/ui/plan/listing/plan-listing.component.html
+++ b/frontend/src/app/ui/plan/listing/plan-listing.component.html
@@ -14,7 +14,7 @@
 			<div *ngIf="hasLoadedListingItems && (hasListingItems || hasFilters)" class="col-12">
 				<app-navigation-breadcrumb />
 			</div>
-			<div *ngIf="hasLoadedListingItems && (hasListingItems || hasFilters)" class="filter-btn" [style.right]="dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="listingItems.length > 2 ? '57px' : '37px'" (click)="openFiltersDialog()">
+			<div *ngIf="hasLoadedListingItems && (hasListingItems || hasFilters) && !isPublic" class="filter-btn" [style.right]="dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="listingItems.length > 2 ? '57px' : '37px'" (click)="openFiltersDialog()">
 				<button mat-raised-button class="p-0" [matBadge]="filtersCount" [matBadgeHidden]="!hasFilters" matBadgePosition="before">
 					<mat-icon class="mr-4 filter-icon">filter_alt</mat-icon>
 				</button>
diff --git a/frontend/src/app/ui/plan/listing/plan-listing.component.ts b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
index 124f75ec3..d80c85c6e 100644
--- a/frontend/src/app/ui/plan/listing/plan-listing.component.ts
+++ b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
@@ -152,9 +152,11 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 				this.onPageLoad({ offset: this.lookup.page.offset / this.lookup.page.size } as PageLoadEvent);
 			});
 		
-		this._loadUserTenants().pipe(takeUntil(this._destroyed)).subscribe( tenants => {
-			this.tenants = tenants;
-		});
+		if (!this.isPublic){
+			this._loadUserTenants().pipe(takeUntil(this._destroyed)).subscribe( tenants => {
+				this.tenants = tenants;
+			});
+		}
 
 		this.formGroup.get('like').valueChanges
 			.pipe(takeUntil(this._destroyed), debounceTime(500))
diff --git a/frontend/src/app/ui/plan/overview/plan-overview.component.html b/frontend/src/app/ui/plan/overview/plan-overview.component.html
index 82dffe521..2bfc01a08 100644
--- a/frontend/src/app/ui/plan/overview/plan-overview.component.html
+++ b/frontend/src/app/ui/plan/overview/plan-overview.component.html
@@ -116,7 +116,7 @@
 					<div class="row mb-4">
 						<ng-container *ngFor="let description of plan.descriptions">
 							<div class="col-12 col-lg-7 mt-1">
-								<a class="w-100 description" [routerLink]="isPublicView ? this.routerUtils.generateUrl(['/descriptions/overview/public/', description.id]) : this.routerUtils.generateUrl(['/descriptions/overview/' + description.id])" target="_blank">
+								<a class="w-100 description" [routerLink]="isPublicView ? this.routerUtils.generateUrl(['/explore-descriptions/overview/public/', description.id]) : this.routerUtils.generateUrl(['/descriptions/overview/' + description.id])" target="_blank">
 									<button class="w-100" [ngClass]="{'plan-btn': description.status === descriptionStatusEnum.Draft, 'plan-finalized-btn': description.status === descriptionStatusEnum.Finalized}">
 										<div matTooltip="{{ description.label }}" class="d-flex align-items-center justify-content-between">
 											<div class="description-btn-label">{{ description.label }}</div>