diff --git a/frontend/src/app/components/search-form/search-form.component.ts b/frontend/src/app/components/search-form/search-form.component.ts
index b9f22b0cf..d34659f8f 100644
--- a/frontend/src/app/components/search-form/search-form.component.ts
+++ b/frontend/src/app/components/search-form/search-form.component.ts
@@ -111,7 +111,7 @@ export class SearchFormComponent implements OnInit {
 
   selectedResult(result: any) {
     if (typeof result === 'string') {
-      this.navigate('/address/', result);
+      this.search();
     } else if (result.alias) {
       this.navigate('/lightning/node/', result.public_key);
     } else if (result.short_id) {
diff --git a/frontend/src/app/components/search-form/search-results/search-results.component.ts b/frontend/src/app/components/search-form/search-results/search-results.component.ts
index 0ce88fe04..4c8571187 100644
--- a/frontend/src/app/components/search-form/search-results/search-results.component.ts
+++ b/frontend/src/app/components/search-form/search-results/search-results.component.ts
@@ -36,7 +36,11 @@ export class SearchResultsComponent implements OnChanges {
         break;
       case 'Enter':
         event.preventDefault();
-        this.selectedResult.emit(this.resultsFlattened[this.activeIdx]);
+        if (this.resultsFlattened[this.activeIdx]) {
+          this.selectedResult.emit(this.resultsFlattened[this.activeIdx]);
+        } else {
+          this.selectedResult.emit(this.searchTerm);
+        }
         this.results = null;
         break;
     }
diff --git a/frontend/src/app/lightning/channel/channel-box/channel-box.component.html b/frontend/src/app/lightning/channel/channel-box/channel-box.component.html
index fa9340205..04471d351 100644
--- a/frontend/src/app/lightning/channel/channel-box/channel-box.component.html
+++ b/frontend/src/app/lightning/channel/channel-box/channel-box.component.html
@@ -1,6 +1,6 @@
 <div class="mb-2 box-top">
   <div class="box-left">
-    <h2 class="mb-0">{{ channel.alias || '?' }}</h2>
+    <h3 class="mb-0">{{ channel.alias || '?' }}</h3>
     <a [routerLink]="['/lightning/node' | relativeUrl, channel.public_key]" >
       {{ channel.public_key | shortenString : 12 }}
     </a>
diff --git a/frontend/src/app/lightning/lightning-wrapper/lightning-wrapper.component.ts b/frontend/src/app/lightning/lightning-wrapper/lightning-wrapper.component.ts
index 40bcc83bc..c38a99fde 100644
--- a/frontend/src/app/lightning/lightning-wrapper/lightning-wrapper.component.ts
+++ b/frontend/src/app/lightning/lightning-wrapper/lightning-wrapper.component.ts
@@ -7,10 +7,14 @@ import { WebsocketService } from 'src/app/services/websocket.service';
   styleUrls: ['./lightning-wrapper.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class LightningWrapperComponent {
+export class LightningWrapperComponent implements OnInit {
 
   constructor(
     private websocketService: WebsocketService,
   ) { }
 
+  ngOnInit() {
+    this.websocketService.want(['blocks']);
+  }
+
 }
diff --git a/lightning-backend/src/api/explorer/channels.api.ts b/lightning-backend/src/api/explorer/channels.api.ts
index 95d660bb4..64f6569bf 100644
--- a/lightning-backend/src/api/explorer/channels.api.ts
+++ b/lightning-backend/src/api/explorer/channels.api.ts
@@ -47,10 +47,10 @@ class ChannelsApi {
     }
   }
 
-  public async $getChannel(shortId: string): Promise<any> {
+  public async $getChannel(id: string): Promise<any> {
     try {
       const query = `SELECT n1.alias AS alias_left, n2.alias AS alias_right, channels.*, ns1.channels AS channels_left, ns1.capacity AS capacity_left, ns2.channels AS channels_right, ns2.capacity AS capacity_right FROM channels LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key LEFT JOIN node_stats AS ns1 ON ns1.public_key = channels.node1_public_key LEFT JOIN node_stats AS ns2 ON ns2.public_key = channels.node2_public_key WHERE (ns1.id = (SELECT MAX(id) FROM node_stats WHERE public_key = channels.node1_public_key) AND ns2.id = (SELECT MAX(id) FROM node_stats WHERE public_key = channels.node2_public_key)) AND channels.id = ?`;
-      const [rows]: any = await DB.query(query, [shortId]);
+      const [rows]: any = await DB.query(query, [id]);
       if (rows[0]) {
         return this.convertChannel(rows[0]);
       }