diff --git a/app/Models/Shop/Tag.php b/app/Models/Shop/Tag.php
index 8cd7d86f..869ec1ce 100644
--- a/app/Models/Shop/Tag.php
+++ b/app/Models/Shop/Tag.php
@@ -3,10 +3,14 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Spatie\Translatable\HasTranslations; 
 
 class Tag extends Model
 {
+    use HasTranslations;
+    
     protected $guarded = ['id'];
+    public $translatable = ['name']; 
 
     public function group()
     {
@@ -20,6 +24,6 @@ class Tag extends Model
 
     public function getNameAttribute($value)
     {
-        return json_decode($value)->fr;
+        return json_decode($value)->fr ?? false;
     }
 }
diff --git a/app/Repositories/Shop/Tags.php b/app/Repositories/Shop/Tags.php
index a8b5c054..09df3721 100644
--- a/app/Repositories/Shop/Tags.php
+++ b/app/Repositories/Shop/Tags.php
@@ -55,7 +55,9 @@ class Tags
     public static function update($data, $id = false)
     {
         $id = $id ? $id : $data['id'];
-        return Tag::find($id)->update($data);
+        $tag = Tag::find($id);
+        $tag->update($data);
+        return $tag;
     }
 
     public static function destroy($id)
diff --git a/resources/views/Admin/Shop/SaleChannels/form.blade.php b/resources/views/Admin/Shop/SaleChannels/form.blade.php
index 1fb92489..b1511a14 100644
--- a/resources/views/Admin/Shop/SaleChannels/form.blade.php
+++ b/resources/views/Admin/Shop/SaleChannels/form.blade.php
@@ -11,7 +11,7 @@
 
 @include('components.save')
 
-@include('load.form.editor.editor')
+@include('load.form.editor')
 
 @push('js')
 	<script>