diff --git a/src/app/shops/shops.component.html b/src/app/shops/shops.component.html
index ddccc884d..80ec892a9 100644
--- a/src/app/shops/shops.component.html
+++ b/src/app/shops/shops.component.html
@@ -1,5 +1,6 @@
 <cc-page-layout fullHeight title="Shops">
     <cc-shops-table
+        [hasMore]="hasMore$ | async"
         [progress]="progress$ | async"
         [shops]="shops$ | async"
         (filterChange)="searchParamsUpdated($event)"
diff --git a/src/app/shops/shops.component.ts b/src/app/shops/shops.component.ts
index f53cdaf2e..4a9d7fb49 100644
--- a/src/app/shops/shops.component.ts
+++ b/src/app/shops/shops.component.ts
@@ -20,6 +20,7 @@ export class ShopsComponent implements OnInit {
         map((res) => res.map((r) => ({ ...r.object.shop_config, info: r.info }))),
     );
     progress$ = this.fetchDomainObjectsService.isLoading$;
+    hasMore$ = this.fetchDomainObjectsService.hasMore$;
 
     ngOnInit() {
         this.searchParamsUpdated('');
diff --git a/src/app/terminals/terminals.component.html b/src/app/terminals/terminals.component.html
index dc88dee06..fe5709903 100644
--- a/src/app/terminals/terminals.component.html
+++ b/src/app/terminals/terminals.component.html
@@ -9,6 +9,7 @@
         [progress]="progress$ | async"
         name="terminals"
         standaloneFilter
+        (filterChange)="filter($event)"
         (more)="more()"
         (update)="update($event)"
     ></v-table>
diff --git a/src/app/terminals/terminals.component.ts b/src/app/terminals/terminals.component.ts
index bfebfb9d8..b6a86eae8 100644
--- a/src/app/terminals/terminals.component.ts
+++ b/src/app/terminals/terminals.component.ts
@@ -139,6 +139,13 @@ export class TerminalsComponent implements OnInit {
         this.dialogService.open(CreateDomainObjectDialogComponent, { objectType: 'terminal' });
     }
 
+    filter(search: string) {
+        this.fetchFullDomainObjectsService.load({
+            type: DomainObjectType.terminal,
+            query: search,
+        });
+    }
+
     private getTerminalShopWalletDelegates(terminalObj: TerminalObject) {
         return this.routingRulesStoreService.routingRules$.pipe(
             map((rules) => getTerminalShopWalletDelegates(rules, terminalObj)),
diff --git a/src/components/shops-table/shops-table.component.html b/src/components/shops-table/shops-table.component.html
index 74c3e2786..7c5d4590c 100644
--- a/src/components/shops-table/shops-table.component.html
+++ b/src/components/shops-table/shops-table.component.html
@@ -2,9 +2,11 @@
     [columns]="columns"
     [data]="shops()"
     [externalFilter]="filterChange.observed"
+    [hasMore]="hasMore"
     [progress]="progress"
     name="shops"
     standaloneFilter
     (filterChange)="filterChange.emit($event)"
+    (more)="more.emit()"
     (update)="update.emit($event)"
 ></v-table>
diff --git a/src/components/shops-table/shops-table.component.ts b/src/components/shops-table/shops-table.component.ts
index 99966a052..8f80de51e 100644
--- a/src/components/shops-table/shops-table.component.ts
+++ b/src/components/shops-table/shops-table.component.ts
@@ -64,8 +64,10 @@ export class ShopsTableComponent {
 
     shops = input<ShopWithInfo[]>([]);
     @Input() progress: number | boolean = false;
+    @Input() hasMore: boolean = false;
     @Output() update = new EventEmitter<UpdateOptions>();
     @Output() filterChange = new EventEmitter<string>();
+    @Output() more = new EventEmitter<void>();
 
     noPartyColumn = input(false, { transform: booleanAttribute });
 
@@ -235,6 +237,7 @@ export class ShopsTableComponent {
                                         partyId,
                                         'routing-rules',
                                         'payment',
+                                        rr.ref.id,
                                     ]),
                             },
                             ...(delegates[idx].length
@@ -248,6 +251,8 @@ export class ShopsTableComponent {
                                               partyId,
                                               'routing-rules',
                                               'payment',
+                                              rr.ref.id,
+                                              'delegate',
                                               delegate.ruleset.id,
                                           ]),
                                   }))
diff --git a/src/components/terminal-delegates-card/terminal-delegates-card.component.ts b/src/components/terminal-delegates-card/terminal-delegates-card.component.ts
index e777f5ab6..c5dbc3c59 100644
--- a/src/components/terminal-delegates-card/terminal-delegates-card.component.ts
+++ b/src/components/terminal-delegates-card/terminal-delegates-card.component.ts
@@ -126,7 +126,7 @@ export class TerminalDelegatesCardComponent implements OnChanges {
                             );
                     case 'wallet_is':
                         return this.partiesStoreService
-                            .getShop(party?.definition?.wallet_is)
+                            .getWallet(party?.definition?.wallet_is)
                             .value$.pipe(
                                 map((wallet) => ({
                                     value: wallet.data.name,