diff --git a/src/app/product-store/product-detail/product-detail.component.html b/src/app/product-store/product-detail/product-detail.component.html
index cde718a..3cc6580 100644
--- a/src/app/product-store/product-detail/product-detail.component.html
+++ b/src/app/product-store/product-detail/product-detail.component.html
@@ -9,10 +9,10 @@
   >
   </ocx-page-header>
   <ocx-page-content>
-    <div *ngIf="!product && !loading" class="card px-3 align-items-center">
+    <div *ngIf="!product && changeMode !== 'NEW'" class="card px-3 align-items-center">
       <p-message severity="error" styleClass="p-2" [text]="'VALIDATION.PRODUCT.NOT_EXISTS' | translate"></p-message>
     </div>
-    <p-tabView *ngIf="product && !loading">
+    <p-tabView *ngIf="(product && !loading) || changeMode === 'NEW'">
       <p-tabPanel id="product_detail_panel_props" [header]="'DIALOG.TABS.PROPERTIES' | translate">
         <ps-product-props
           [product]="product"
diff --git a/src/app/product-store/product-detail/product-detail.component.ts b/src/app/product-store/product-detail/product-detail.component.ts
index 3d6fd6d..8b4e679 100644
--- a/src/app/product-store/product-detail/product-detail.component.ts
+++ b/src/app/product-store/product-detail/product-detail.component.ts
@@ -21,7 +21,7 @@ export class ProductDetailComponent implements OnInit {
   @ViewChild(ProductPropertyComponent, { static: false }) productPropsComponent!: ProductPropertyComponent
 
   private apiPrefix = environment.apiPrefix
-  private productName: string
+  public productName: string
   public product: Product | undefined
   //  usedInWorkspace: Workspace[] | undefined
   public changeMode: ChangeMode = 'NEW'
diff --git a/src/app/product-store/product-search/product-search.component.html b/src/app/product-store/product-search/product-search.component.html
index 0d13b40..4372ce4 100644
--- a/src/app/product-store/product-search/product-search.component.html
+++ b/src/app/product-store/product-search/product-search.component.html
@@ -19,6 +19,9 @@
   </ocx-search-criteria>
 
   <ocx-page-content>
+    <div *ngIf="!product$" class="card px-3 align-items-center">
+      <p-message severity="error" styleClass="p-2" [text]="'VALIDATION.PRODUCT.NOT_EXISTS' | translate"></p-message>
+    </div>
     <ng-container *ngIf="product$ | async as products">
       <p-dataView
         id="product_search_dataview"
diff --git a/src/app/product-store/product-search/product-search.component.ts b/src/app/product-store/product-search/product-search.component.ts
index 71161ea..3d1eef1 100644
--- a/src/app/product-store/product-search/product-search.component.ts
+++ b/src/app/product-store/product-search/product-search.component.ts
@@ -76,7 +76,7 @@ export class ProductSearchComponent implements OnInit {
           sortDropdownPlaceholder: data['ACTIONS.DATAVIEW.SORT_BY'],
           filterInputPlaceholder: data['ACTIONS.DATAVIEW.FILTER'],
           filterInputTooltip:
-            data['ACTIONS.DATAVIEW.FILTER_OF'] + data['PRODUCT.NAME'] + ', ' + data['PRODUCT.DESCRIPTION'],
+            data['ACTIONS.DATAVIEW.FILTER_OF'] + data['PRODUCT.NAME'] + ', ' + data['PRODUCT.DISPLAY_NAME'],
           viewModeToggleTooltips: {
             grid: data['ACTIONS.DATAVIEW.VIEW_MODE_GRID'],
             list: data['ACTIONS.DATAVIEW.VIEW_MODE_LIST']