diff --git a/app/Criteria/ProductSearch.php b/app/Criteria/ProductSearch.php
index b548657c5..0846f7de5 100644
--- a/app/Criteria/ProductSearch.php
+++ b/app/Criteria/ProductSearch.php
@@ -10,10 +10,10 @@ class ProductSearch extends Criterion
     public function query(Builder $query): Builder
     {
         return $query->whereFullText([
-            'name',
-            'description_html',
-            'description_short',
-            'search_values',
+            'products.name',
+            'products.description_html',
+            'products.description_short',
+            'products.search_values',
         ], $this->value);
     }
 }
diff --git a/tests/Feature/Products/ProductSearchValuesTest.php b/tests/Feature/Products/ProductSearchValuesTest.php
deleted file mode 100644
index 0182eb10e..000000000
--- a/tests/Feature/Products/ProductSearchValuesTest.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-
-namespace Tests\Feature\Products;
-
-use App\Enums\AttributeType;
-use App\Models\Attribute;
-use App\Models\AttributeOption;
-use App\Models\Product;
-use App\Models\ProductSet;
-use App\Models\Tag;
-use Tests\TestCase;
-
-class ProductSearchValuesTest extends TestCase
-{
-    public Product $product;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->product = Product::factory()->create([
-            'name' => 'Searched product',
-            'public' => true,
-            'description_html' => 'Lorem ipsum',
-            'description_short' => 'short',
-        ]);
-    }
-
-    /**
-     * @dataProvider authProvider
-     */
-    public function testUpdateTagSearchValues(string $user): void
-    {
-        $this->{$user}->givePermissionTo('tags.edit');
-
-        $tag = Tag::factory()->create();
-        $this->product->tags()->sync($tag->getKey());
-
-        $this
-            ->actingAs($this->{$user})
-            ->json('PATCH', 'tags/id:' . $tag->getKey(), [
-                'name' => 'Tag updated',
-            ])
-            ->assertOk();
-
-        $this->assertDatabaseHas('products', [
-            'id' => $this->product->getKey(),
-            'name' => 'Searched product',
-            'description_html' => 'Lorem ipsum',
-            'search_values' => 'Tag updated',
-        ]);
-    }
-
-    /**
-     * @dataProvider authProvider
-     */
-    public function testDeleteTagSearchValues(string $user): void
-    {
-        $this->{$user}->givePermissionTo('tags.remove');
-
-        $tag = Tag::factory()->create();
-        $this->product->tags()->sync($tag->getKey());
-
-        $this
-            ->actingAs($this->{$user})
-            ->json('DELETE', 'tags/id:' . $tag->getKey())
-            ->assertNoContent();
-
-        $this->assertDatabaseHas('products', [
-            'id' => $this->product->getKey(),
-            'name' => 'Searched product',
-            'description_html' => 'Lorem ipsum',
-            'search_values' => '',
-        ]);
-    }
-
-    /**
-     * @dataProvider authProvider
-     */
-    public function testUpdateProductSetSearchValues(string $user): void
-    {
-        $this->{$user}->givePermissionTo('product_sets.edit');
-
-        $set = ProductSet::factory()->create([
-            'public' => true,
-        ]);
-        $this->product->sets()->sync($set->getKey());
-
-        $this
-            ->actingAs($this->{$user})
-            ->json('PATCH', 'product-sets/id:' . $set->getKey(), [
-                'name' => 'set name',
-                'parent_id' => null,
-                'children_ids' => [],
-            ])
-            ->assertOk();
-
-        $this->assertDatabaseHas('products', [
-            'id' => $this->product->getKey(),
-            'name' => 'Searched product',
-            'description_html' => 'Lorem ipsum',
-            'search_values' => 'set name',
-        ]);
-    }
-
-    /**
-     * @dataProvider authProvider
-     */
-    public function testDeleteProductSetSearchValues(string $user): void
-    {
-        $this->{$user}->givePermissionTo('product_sets.remove');
-
-        $set = ProductSet::factory()->create([
-            'public' => true,
-        ]);
-        $this->product->sets()->sync($set->getKey());
-
-        $this
-            ->actingAs($this->{$user})
-            ->json('DELETE', 'product-sets/id:' . $set->getKey())
-            ->assertNoContent();
-
-        $this->assertDatabaseHas('products', [
-            'id' => $this->product->getKey(),
-            'name' => 'Searched product',
-            'description_html' => 'Lorem ipsum',
-            'search_values' => '',
-        ]);
-    }
-
-    /**
-     * @dataProvider authProvider
-     */
-    public function testUpdateAttributeSearchValues(string $user): void
-    {
-        $this->{$user}->givePermissionTo('attributes.edit');
-
-        /** @var Attribute $attribute */
-        $attribute = Attribute::factory()->create();
-        $this->product->attributes()->attach($attribute->getKey());
-
-        $this
-            ->actingAs($this->{$user})
-            ->json('PATCH', 'attributes/id:' . $attribute->getKey(), [
-                'name' => 'updated attribute',
-                'slug' => $attribute->slug,
-                'type' => $attribute->type,
-                'global' => true,
-                'sortable' => true,
-            ])
-            ->assertOk();
-
-        $this->assertDatabaseHas('products', [
-            'id' => $this->product->getKey(),
-            'name' => 'Searched product',
-            'description_html' => 'Lorem ipsum',
-            'search_values' => 'updated attribute',
-        ]);
-    }
-
-    /**
-     * @dataProvider authProvider
-     */
-    public function testDeleteAttributeSearchValues(string $user): void
-    {
-        $this->{$user}->givePermissionTo('attributes.remove');
-
-        /** @var Attribute $attribute */
-        $attribute = Attribute::factory()->create();
-        $this->product->attributes()->attach($attribute->getKey());
-
-        $this
-            ->actingAs($this->{$user})
-            ->json('DELETE', 'attributes/id:' . $attribute->getKey())
-            ->assertNoContent();
-
-        $this->assertDatabaseHas('products', [
-            'id' => $this->product->getKey(),
-            'name' => 'Searched product',
-            'description_html' => 'Lorem ipsum',
-            'search_values' => '',
-        ]);
-    }
-
-    /**
-     * @dataProvider authProvider
-     */
-    public function testUpdateAttributeOptionSearchValues(string $user): void
-    {
-        $this->{$user}->givePermissionTo('attributes.edit');
-
-        /** @var Attribute $attribute */
-        $attribute = Attribute::factory()->create([
-            'name' => 'Attribute',
-            'type' => AttributeType::NUMBER->value,
-        ]);
-
-        $option = AttributeOption::factory()->create([
-            'index' => 1,
-            'attribute_id' => $attribute->getKey(),
-        ]);
-
-        $this->product->attributes()->attach($attribute->getKey());
-        $this->product->attributes->first()->pivot->options()->attach($option->getKey());
-
-        $this
-            ->actingAs($this->{$user})
-            ->json('PATCH', 'attributes/id:' . $attribute->getKey() . '/options/id:' . $option->getKey(), [
-                'name' => 'option 1',
-                'value_number' => 10,
-                'value_date' => '2023-09-08',
-            ])
-            ->assertOk();
-
-        $this->assertDatabaseHas('products', [
-            'id' => $this->product->getKey(),
-            'name' => 'Searched product',
-            'description_html' => 'Lorem ipsum',
-            'search_values' => 'Attribute option 1 10 2023-09-08',
-        ]);
-    }
-
-    /**
-     * @dataProvider authProvider
-     */
-    public function testDeleteAttributeOptionSearchValues(string $user): void
-    {
-        $this->{$user}->givePermissionTo('attributes.edit');
-
-        /** @var Attribute $attribute */
-        $attribute = Attribute::factory()->create([
-            'name' => 'Attribute',
-            'type' => AttributeType::NUMBER->value,
-        ]);
-
-        $option = AttributeOption::factory()->create([
-            'index' => 1,
-            'attribute_id' => $attribute->getKey(),
-        ]);
-
-        $this->product->attributes()->attach($attribute->getKey());
-        $this->product->attributes->first()->pivot->options()->attach($option->getKey());
-
-        $this
-            ->actingAs($this->{$user})
-            ->json('DELETE', 'attributes/id:' . $attribute->getKey() . '/options/id:' . $option->getKey())
-            ->assertNoContent();
-
-        $this->assertDatabaseHas('products', [
-            'id' => $this->product->getKey(),
-            'name' => 'Searched product',
-            'description_html' => 'Lorem ipsum',
-            'search_values' => 'Attribute',
-        ]);
-    }
-}