diff --git a/lib/NGCP/Panel/Controller/API/Subscribers.pm b/lib/NGCP/Panel/Controller/API/Subscribers.pm
index 16ba261dd4..5d77fda0db 100644
--- a/lib/NGCP/Panel/Controller/API/Subscribers.pm
+++ b/lib/NGCP/Panel/Controller/API/Subscribers.pm
@@ -200,10 +200,15 @@ sub query_params {
             query => {
                 first => sub {
                     my $q = shift;
-                    return \['exists ( select subscriber_id, group_concat(concat(cc,ac,sn)) as aliases from billing.voip_numbers voip_subscriber_aliases_csv where voip_subscriber_aliases_csv.`subscriber_id` = `me`.`id` group by subscriber_id having aliases like ?)', [ {} => '%'.$q.'%'] ];
+                    {
+                        'voip_dbaliases.username' => { like => '%'.$q.'%' },
+                    };
                 },
                 second => sub {
-                    return { };
+                    {
+                        join => { 'provisioning_voip_subscriber' => 'voip_dbaliases' },
+                        distinct => 1,
+                    };
                 },
             },
         },
@@ -264,9 +269,9 @@ sub query_params {
 }
 
 sub order_by_cols {
-    return 
-        { create_timestamp => 'provisioning_voip_subscriber.create_timestamp' }, 
-        { 
+    return
+        { create_timestamp => 'provisioning_voip_subscriber.create_timestamp' },
+        {
             columns_are_additional => 1,
             create_timestamp => {
                 join => 'provisioning_voip_subscriber',
diff --git a/lib/NGCP/Panel/Utils/ProfilePackages.pm b/lib/NGCP/Panel/Utils/ProfilePackages.pm
index afa91626dd..b6d8c4a543 100644
--- a/lib/NGCP/Panel/Utils/ProfilePackages.pm
+++ b/lib/NGCP/Panel/Utils/ProfilePackages.pm
@@ -903,7 +903,7 @@ sub _add_second {
 
 sub _get_notopup_expiration {
     my %params = @_;
-    my($contract,$start_mode,$notopup_discard_intervals,$interval_unit,$last_balance)= @params{qw/contract $start_mode notopup_discard_intervals interval_unit last_balance/};
+    my($contract,$start_mode,$notopup_discard_intervals,$interval_unit,$last_balance)= @params{qw/contract start_mode notopup_discard_intervals interval_unit last_balance/};
     my $notopup_expiration = undef;
     if ($notopup_discard_intervals) {
         #take the start of the latest interval where a topup occurred,