diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java
index e64efdb6..c1c39dbd 100644
--- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java
+++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java
@@ -58,23 +58,20 @@ class SearchControllerTest {
 
     @Test
     void searchForChannelId_viaShortChannelId_found() throws Exception {
-        given(this.dataService.getOpenChannels()).willReturn(
-                List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO))
-        );
-        given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO));
-        mockMvc.perform(MockMvcRequestBuilders.get("/search?q=783231610496155649"))
-                .andExpect(status().isOk())
-                .andExpect(model().attribute("id", is(CHAN_DETAILS_DTO.channelId())))
-                .andExpect(view().name("channel-details"));
+        searchForChannelId("783231610496155649");
     }
 
     @Test
     void searchForChannelId_viaCompactChannelId_found() throws Exception {
+        searchForChannelId("712345x123x1");
+    }
+
+    private void searchForChannelId(String query) throws Exception {
         given(this.dataService.getOpenChannels()).willReturn(
                 List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO))
         );
         given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO));
-        mockMvc.perform(MockMvcRequestBuilders.get("/search?q=712345x123x1"))
+        mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + query))
                 .andExpect(status().isOk())
                 .andExpect(model().attribute("id", is(CHAN_DETAILS_DTO.channelId())))
                 .andExpect(view().name("channel-details"));
@@ -82,19 +79,19 @@ class SearchControllerTest {
 
     @Test
     void searchForPubkey_found() throws Exception {
-        given(this.dataService.getOpenChannels()).willReturn(List.of(OPEN_CHANNEL_DTO));
-        given(this.pageService.nodeDetails(any())).willReturn(new NodeDetailsPage(NODE_DETAILS_DTO));
-        mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + NODE_DETAILS_DTO.node().toString()))
-                .andExpect(status().isOk())
-                .andExpect(model().attribute("pubkey", is(OPEN_CHANNEL_DTO.remotePubkey())))
-                .andExpect(view().name("node-details"));
+        searchAndExpectSingleNode(NODE_DETAILS_DTO.node().toString());
     }
 
+
     @Test
     void searchForAlias_found() throws Exception {
+        searchAndExpectSingleNode("albert");
+    }
+
+    private void searchAndExpectSingleNode(String query) throws Exception {
         given(this.dataService.getOpenChannels()).willReturn(List.of(OPEN_CHANNEL_DTO));
         given(this.pageService.nodeDetails(any())).willReturn(new NodeDetailsPage(NODE_DETAILS_DTO));
-        mockMvc.perform(MockMvcRequestBuilders.get("/search?q=albert"))
+        mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + query))
                 .andExpect(status().isOk())
                 .andExpect(model().attribute("pubkey", is(OPEN_CHANNEL_DTO.remotePubkey())))
                 .andExpect(view().name("node-details"));
diff --git a/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java b/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java
index 80e253dd..f2c59c0f 100644
--- a/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java
+++ b/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java
@@ -141,9 +141,9 @@ public class DemoApplication {
                     Pubkey.create(node.pubkey()),
                     node.alias(),
                     List.of(ChannelIdFixtures.CHANNEL_ID),
-                    List.of(ChannelIdFixtures.CHANNEL_ID),
-                    List.of(ChannelIdFixtures.CHANNEL_ID),
-                    List.of(ChannelIdFixtures.CHANNEL_ID),
+                    List.of(ChannelIdFixtures.CHANNEL_ID_2),
+                    List.of(),
+                    List.of(),
                     OnChainCostsDto.createFromModel(ON_CHAIN_COSTS),
                     BalanceInformationDto.createFromModel(BALANCE_INFORMATION),
                     OnlineReportDto.createFromModel(onlineReport),