diff --git a/app/Classes/General/Eloquent/Filters/HasVouchersAll.php b/app/Classes/General/Eloquent/Filters/HasVouchersAllWithUser.php
similarity index 96%
rename from app/Classes/General/Eloquent/Filters/HasVouchersAll.php
rename to app/Classes/General/Eloquent/Filters/HasVouchersAllWithUser.php
index d2ff7a2e..79a02914 100644
--- a/app/Classes/General/Eloquent/Filters/HasVouchersAll.php
+++ b/app/Classes/General/Eloquent/Filters/HasVouchersAllWithUser.php
@@ -6,7 +6,7 @@ use App\Classes\ValueObjects\Constants\RoleTypes;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 
-class HasVouchersAll implements Filter
+class HasVouchersAllWithUser implements Filter
 {
 
     /**
diff --git a/app/Http/Resources/VoucherResource.php b/app/Http/Resources/VoucherResource.php
index 7e372d5f..96d139b9 100644
--- a/app/Http/Resources/VoucherResource.php
+++ b/app/Http/Resources/VoucherResource.php
@@ -17,8 +17,7 @@ class VoucherResource extends JsonResource
     public function toArray($request)
     {
         $filteredRedemptions = new ArrayObject([]);
-        if ($request->has('filters') && (str_contains($request->input('filters'), "has_active_reward_with_user") )) {
-            //|| str_contains($request->input('filters'), "has_active_reward_with_company")
+        if ($request->has('filters') && str_contains($request->input('filters'), "has_vouchers_all_with_user")) {
             $filteredRedemptions = new ArrayObject([]);
         }
         else{
diff --git a/resources/assets/vue/components/accounts/elements/VouchersNavigationBarComponent.vue b/resources/assets/vue/components/accounts/elements/VouchersNavigationBarComponent.vue
index 60947cb9..ed2d8a93 100644
--- a/resources/assets/vue/components/accounts/elements/VouchersNavigationBarComponent.vue
+++ b/resources/assets/vue/components/accounts/elements/VouchersNavigationBarComponent.vue
@@ -16,7 +16,7 @@
             }
         },
         created(){
-            this.submit(this.route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all': true,  order_by:{ column:'id', DESC:true }} ), 'get', 'voucherNavigationSection', false, false);
+            this.submit(this.route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user': true,  order_by:{ column:'id', DESC:true }} ), 'get', 'voucherNavigationSection', false, false);
         },
         methods: {
             successHandler(response){
diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index cf06df0b..a4ba5912 100644
--- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -98,7 +98,7 @@
             fetchVouchers(){
                 this.isLoading = true;
                 if(this.employee){
-                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_active_reward_with_company':  this.employee.id} ), 'get', this.section, false, false);
+                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user':  this.employee.id} ), 'get', this.section, false, false);
                 }
             },
             successHandler(response){
diff --git a/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
index aa7a3d96..b869cf73 100644
--- a/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
@@ -79,7 +79,7 @@
             fetchVouchers(){
                 this.isLoading = true;
                 if(this.employee){
-                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_active_reward_with_company':  this.employee.id} ), 'get', this.section, false, false);
+                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user':  this.employee.id} ), 'get', this.section, false, false);
                 }
             },
             successHandler(response){
diff --git a/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
index e28b2988..d41c2b63 100644
--- a/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
@@ -57,7 +57,7 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col" v-if="this.$store.getters.getUserId">
-                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_active_reward_with_user': id }">
+                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_vouchers_all_with_user': id }">
                                                                 <template slot="list" slot-scope="{data}">
                                                                     <single-user-reward-item-component :data="data"></single-user-reward-item-component>
                                                                 </template>
diff --git a/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
index 5e428b40..5abb8df1 100644
--- a/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
@@ -52,7 +52,7 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col" v-if="this.$store.getters.getUserId">
-                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_active_reward_with_user': true }">
+                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_vouchers_all_with_user': true }">
                                                                 <template slot="list" slot-scope="{data}">
                                                                     <single-user-reward-item-component :data="data"></single-user-reward-item-component>
                                                                 </template>
diff --git a/resources/assets/vue/components/general/elements/VouchersSummaryAdminComponent.vue b/resources/assets/vue/components/general/elements/VouchersSummaryAdminComponent.vue
index dc4a2a54..9a3987e6 100644
--- a/resources/assets/vue/components/general/elements/VouchersSummaryAdminComponent.vue
+++ b/resources/assets/vue/components/general/elements/VouchersSummaryAdminComponent.vue
@@ -30,7 +30,7 @@
             }
         },
         created(){
-            this.submit(this.route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all': this.company.employee.id,  order_by:{ column:'id', DESC:true }} ), 'get', this.section, false, false);
+            this.submit(this.route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user': this.company.employee.id,  order_by:{ column:'id', DESC:true }} ), 'get', this.section, false, false);
         },
         methods: {
             successHandler(response){