diff --git a/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm b/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
index 17457d682c..0621ff09eb 100644
--- a/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
+++ b/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
@@ -14,27 +14,38 @@ use NGCP::Panel::Utils::Kamailio;
 use NGCP::Panel::Utils::Subscriber;
 
 sub _item_rs {
-    my ($self, $c) = @_;
+    my ($self, $c, $filter) = @_;
 
     my $item_rs;
 
     if ($c->config->{redis}->{usrloc}) {
         # TODO: will this survive with like 1M records?
 
-        my $filter = {};
-        if ($c->req->param('subscriber_id')) {
-            my $sub = $c->model('DB')->resultset('voip_subscribers')->find($c->req->param('subscriber_id'));
-            if ($sub) {
-                $filter->{username} = $sub->username;
+        unless (defined $filter) {
+            $filter = {};
+            if ($c->req->param('subscriber_id')) {
+                my $sub = $c->model('DB')->resultset('voip_subscribers')->find($c->req->param('subscriber_id'));
+                if ($sub) {
+                    $filter->{username} = $sub->username;
+                }
+                if($c->config->{features}->{multidomain}) {
+                    $filter->{domain} = $sub->domain->domain;
+                } else {
+                    $filter->{domain} = undef;
+                }
+            } else {
+                if ($c->config->{features}->{multidomain}) {
+                    $filter->{domain} = { like => '.+' };
+                } else {
+                    $filter->{domain} = undef;
+                }
             }
-            if($c->config->{features}->{multidomain}) {
-                $filter->{domain} = $sub->domain->domain;
+
+            if ($c->user->roles eq "admin" || $c->user->roles eq "ccareadmin") {
+            } elsif ($c->user->roles eq "reseller" || $c->user->roles eq "ccare") {
+                $filter->{reseller_id} = $c->user->reseller_id;
             }
         }
-        if ($c->user->roles eq "admin") {
-        } elsif ($c->user->roles eq "reseller") {
-            $filter->{reseller_id} = $c->user->reseller_id;
-        }
         $item_rs = NGCP::Panel::Utils::Subscriber::get_subscriber_location_rs($c, $filter);
     } else {
         my @joins = ();
@@ -123,7 +134,7 @@ sub resource_from_item {
 sub item_by_id {
     my ($self, $c, $id) = @_;
 
-    my $item_rs = $self->item_rs($c);
+    my $item_rs = $self->item_rs($c,{ id => $id, });
     return $item_rs->find($id);
 }
 
diff --git a/lib/NGCP/Panel/Utils/Subscriber.pm b/lib/NGCP/Panel/Utils/Subscriber.pm
index 6ffd05369e..818ed45d57 100644
--- a/lib/NGCP/Panel/Utils/Subscriber.pm
+++ b/lib/NGCP/Panel/Utils/Subscriber.pm
@@ -48,7 +48,7 @@ sub get_subscriber_location_rs {
             }
             $redis->select($c->config->{redis}->{usrloc_db});
             my $rs = NGCP::Panel::Utils::RedisLocationResultSet->new(_redis => $redis, _c => $c);
-            $rs = $rs->search($filter) if $filter;
+            $rs = $rs->search($filter) if ($filter and scalar keys %$filter);
             return $rs;
         } catch($e) {
             $c->log->error("Failed to fetch location information from redis: $e");