diff --git a/app/Http/Controllers/Shop/HomeController.php b/app/Http/Controllers/Shop/HomeController.php
index 097d8804..d151bb20 100644
--- a/app/Http/Controllers/Shop/HomeController.php
+++ b/app/Http/Controllers/Shop/HomeController.php
@@ -9,6 +9,7 @@ use App\Repositories\Shop\Articles;
 use App\Repositories\Shop\Categories;
 use App\Repositories\Shop\Offers;
 use App\Repositories\Shop\Tags;
+use App\Repositories\Shop\TagGroups;
 
 class HomeController extends Controller
 {
@@ -24,11 +25,8 @@ class HomeController extends Controller
         $data['display_by_rows'] = $input['by_rows'] ?? false;
         // $data['offers'] = Offers::getLast()->toArray();
         $data['articles'] = Articles::getArticlesToSell();
-        $data['tags'] = Tags::getWithCountOffers();
-
-        // $data['prices'] = $data['articles']['offers'][0]['tariff']['price_lists'][0]['price_list_values'][0];
-        // dump($data);
-        // exit;
+        // $data['tags'] = Tags::getWithCountOffers();
+        $data['tags'] = TagGroups::getWithTagsAndCountOffers();
         return view('Shop.home', $data);
     }
 }
diff --git a/app/Repositories/Shop/Articles.php b/app/Repositories/Shop/Articles.php
index b38b4be3..b8e35df3 100644
--- a/app/Repositories/Shop/Articles.php
+++ b/app/Repositories/Shop/Articles.php
@@ -64,8 +64,6 @@ class Articles
     public static function getArticlesToSell()
     {
         $articles = self::getArticlesWithOffers();
-        // dump($articles->toArray());
-        // exit;
         foreach ($articles as $article) {
             $price_lists = $article->offers[0]->tariff->price_lists->toArray();
             // dump($price_lists);
@@ -75,6 +73,8 @@ class Articles
                     'image' => $article->image,
                     'product_type' => $article->product_type,
                     'product_id' => $article->product_id,
+                    'product_name' => $article->product->name,
+                    'parent_name' => trim(str_replace($article->product->name, '', $article->name)),
                 ];
                 $prices = $price_lists[0]['price_list_values'][0];
                 $article_nature_name = strtolower($article->article_nature->name);
diff --git a/app/Repositories/Shop/TagGroups.php b/app/Repositories/Shop/TagGroups.php
index a0775eb8..3b9231db 100644
--- a/app/Repositories/Shop/TagGroups.php
+++ b/app/Repositories/Shop/TagGroups.php
@@ -2,17 +2,11 @@
 
 namespace App\Repositories\Shop;
 
-use Yajra\DataTables\DataTables;
-
 use App\Models\Shop\TagGroup;
+use App\Models\Shop\Tag;
 
 class TagGroups
 {
-    public static function getDatatable()
-    {
-        $model = TagGroup::query();
-        return Datatables::of($model)->make(true);
-    }
 
     public static function getOptions()
     {
@@ -21,7 +15,17 @@ class TagGroups
 
     public static function getWithTagsAndCountOffers()
     {
-        return TagGroup::with('tags')->withCount(['tags.articles'])->get()->toArray();
+        $tags = Tag::withCount(['articles'])->get()->toArray();
+        $tag_groups = TagGroup::pluck('name','id')->toArray();
+        foreach ($tags as $tag) {
+            $data[$tag['tag_group_id']]['name'] = $tag_groups[$tag['tag_group_id']];
+            $data[$tag['tag_group_id']]['tags'][] = [
+                'id' => $tag['id'],
+                'name' => $tag['name'],
+                'count' => $tag['articles_count'],
+            ];
+        }
+        return $data;
     }
 
     public static function getTreeTags()
diff --git a/resources/views/Shop/Articles/partials/article.blade.php b/resources/views/Shop/Articles/partials/article.blade.php
index a57e513d..d7dc1232 100644
--- a/resources/views/Shop/Articles/partials/article.blade.php
+++ b/resources/views/Shop/Articles/partials/article.blade.php
@@ -2,31 +2,34 @@
 	<div class="card">
 		<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="card-img-top" alt="...">
 		<div class="card-body">
-			<span class="card-title" style="font-weight: bold; color: green;">{{ $product_name }}</span>
-			<span class="float-right" style="font-size: 2em; color: red;">
-				<i class="fa fa-heart"></i>
-			</span>
-
-			<p class="card-text">
-				<div class="row" style="color: green;">
-					<div class="col-6">
-						@if ($article['semences'] ?? false)
-							<span style="font-size: 1.4em; font-weight: bold;">{{ $article['semences']['price']  ?? null }}</span> €<br>
-						@else
-							Indisponible
-						@endif
-						Semence
-					</div>
-					<div class="col-6">
-						@if ($article['plants'] ?? false)
-							<span style="font-size: 1.4em; font-weight: bold;">{{ $article['plants']['price'] }}</span> €<br>
-						@else
-							Indisponible
-						@endif
-						Plant
-					</div>
+			<div class="row card-title">
+				<div class="col-10" style="font-weight: bold; color: green;">
+					<h2 style="font-size: 1.4em;">{{ $article['parent_name'] }}</h2>
+					{{ $article['product_name'] }}
 				</div>
-			</p>
+				<div class="col-2 p-0 text-right" style="font-size: 2em; color: red;">
+					<i class="fa fa-heart"></i>
+				</div>
+			</div>
+
+			<div class="row" style="color: green;">
+				<div class="col-6">
+					@if ($article['semences'] ?? false)
+						<span style="font-size: 1.4em; font-weight: bold;">{{ $article['semences']['price']  ?? null }}</span> €<br>
+					@else
+						Indisponible<br>
+					@endif
+					Semence
+				</div>
+				<div class="col-6">
+					@if ($article['plants'] ?? false)
+						<span style="font-size: 1.4em; font-weight: bold;">{{ $article['plants']['price'] }}</span> €<br>
+					@else
+						Indisponible<br>
+					@endif
+					Plant
+				</div>
+			</div>
 		</div>
 	</div>
 </a>
diff --git a/resources/views/Shop/Tags/partials/filter.blade.php b/resources/views/Shop/Tags/partials/filter.blade.php
index 7e5f68ec..8dfc12ad 100644
--- a/resources/views/Shop/Tags/partials/filter.blade.php
+++ b/resources/views/Shop/Tags/partials/filter.blade.php
@@ -1,2 +1,12 @@
-@foreach ($tags as $tag)
+@foreach ($tags as $group)
+    <h5>{{ $group['name'] }}</h5>
+    @foreach ($group['tags'] as $tag)
+        <div>
+            @include('components.form.checkbox', [
+                'name' => 'tag[]',
+                'val' => $tag['id'],
+            ])
+            {{ $tag['name'] }} ({{ $tag['count'] }})
+        </div>
+    @endforeach
 @endforeach
\ No newline at end of file
diff --git a/resources/views/Shop/home.blade.php b/resources/views/Shop/home.blade.php
index 1c23495c..8baa3b6f 100644
--- a/resources/views/Shop/home.blade.php
+++ b/resources/views/Shop/home.blade.php
@@ -5,6 +5,7 @@
 @section('content')
 	<div class="row">
 		<div class="col-2">
+			@include('Shop.Tags.partials.filter')
 		</div>
 		<div class="col-10">
 			@if ($display_by_rows ?? false)
diff --git a/resources/views/components/form/checkbox.blade.php b/resources/views/components/form/checkbox.blade.php
index 357279d9..65eb77db 100644
--- a/resources/views/components/form/checkbox.blade.php
+++ b/resources/views/components/form/checkbox.blade.php
@@ -1,4 +1,4 @@
-<input type="checkbox" name="{{ $name }}" id="{{ $id_name ?? $name }}" class="{{ $class ?? ''}}" value="{{ $val ?? 1}}" {{ $meta ?? '' }}
+<input type="checkbox" name="{{ $name }}" id="{{ $id_name ?? $name }}" class="{{ $class ?? ''}}" value="{{ $val ?? 1}}" {{ $meta ?? '' }} 
 @if ( (isset($value) && isset($val) && ($value == $val)) || (!isset($val) && $value)) checked @endif
 @if (isset($disabled) && $disabled)disabled="disabled"@endif
 >
\ No newline at end of file