diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts
index 2b073d874..1bb4f4359 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts
+++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts
@@ -49,10 +49,11 @@ export class DiscoverCardComponent implements OnInit {
         } else {
             this.tvSearchResult = await this.searchService.getTvInfo(+this.result.id);
         }
-        if (this.tvSearchResult?.status.length > 0 && this.tvSearchResult?.status === "404") {
+        if (!this.tvSearchResult || this.tvSearchResult?.status.length > 0 && this.tvSearchResult?.status === "404") {
             this.hide = true;
             return;
         }
+
         this.setTvDefaults(this.tvSearchResult);
         this.updateTvItem(this.tvSearchResult);
 
@@ -161,9 +162,6 @@ export class DiscoverCardComponent implements OnInit {
 
 
     private setTvDefaults(x: ISearchTvResultV2) {
-        if(!x) {
-            this.hide = true;
-        }
         if (x.imdbId) {
             x.imdbId = "http://www.imdb.com/title/" + x.imdbId + "/";
         } else {
diff --git a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html
index 3e2349d55..328c0bce1 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html
+++ b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html
@@ -1,8 +1,8 @@
 <div class="right">
-<mat-button-toggle-group name="discoverMode" value="{{discoverOptions}}" class="discover-filter-buttons-group">
-    <mat-button-toggle ngDefaultControl [class.cdk-focused]="discoverOptions === DiscoverOption.Combined" (click)="switchDiscoverMode(DiscoverOption.Combined)" [(ngModel)]="discoverOptions" value="{{DiscoverOption.Combined}}" class="discover-filter-button">{{'Discovery.Combined' | translate}}</mat-button-toggle>
-    <mat-button-toggle ngDefaultControl [class.cdk-focused]="discoverOptions === DiscoverOption.Movie" (click)="switchDiscoverMode(DiscoverOption.Movie)" [(ngModel)]="discoverOptions" value="{{DiscoverOption.Movie}}" class="discover-filter-button">{{'Discovery.Movies' | translate}}</mat-button-toggle>
-    <mat-button-toggle ngDefaultControl [class.cdk-focused]="discoverOptions === DiscoverOption.Tv" (click)="switchDiscoverMode(DiscoverOption.Tv)" [(ngModel)]="discoverOptions" value="{{DiscoverOption.Tv}}" class="discover-filter-button">{{'Discovery.Tv' | translate}}</mat-button-toggle>
+<mat-button-toggle-group name="discoverMode" (change)="toggleChanged($event)" value="{{discoverOptions}}" class="discover-filter-buttons-group">
+    <mat-button-toggle [ngClass]="{'button-active': discoverOptions === DiscoverOption.Combined}" value="{{DiscoverOption.Combined}}" class="discover-filter-button">{{'Discovery.Combined' | translate}}</mat-button-toggle>
+    <mat-button-toggle [ngClass]="{'button-active': discoverOptions === DiscoverOption.Movie}" value="{{DiscoverOption.Movie}}" class="discover-filter-button">{{'Discovery.Movies' | translate}}</mat-button-toggle>
+    <mat-button-toggle [ngClass]="{'button-active': discoverOptions === DiscoverOption.Tv}" value="{{DiscoverOption.Tv}}" class="discover-filter-button">{{'Discovery.Tv' | translate}}</mat-button-toggle>
   </mat-button-toggle-group>
 </div>
 
diff --git a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss
index 485ebdb12..a954ce52c 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss
+++ b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss
@@ -76,13 +76,14 @@
     border-radius: 30px;
   }
 
-  .discover-filter-button.cdk-focused{
+  .button-active{
     background:$ombi-active;
   }
 
- ::ng-deep .discover-filter-button .mat-button-toggle-button:focus{
-    outline:none;
-  }
+
+}
+::ng-deep .discover-filter-button .mat-button-toggle-button:focus{
+  outline:none;
 }
 
 .card-skeleton {
diff --git a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts
index bf6453d2b..651ff0b2a 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts
+++ b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts
@@ -3,6 +3,7 @@ import { DiscoverOption, IDiscoverCardResult } from "../../interfaces";
 import { ISearchMovieResult, ISearchTvResult, RequestType } from "../../../interfaces";
 import { SearchV2Service } from "../../../services";
 import { StorageService } from "../../../shared/storage/storage-service";
+import { MatButtonToggleChange } from '@angular/material/button-toggle';
 
 export enum DiscoverType {
     Upcoming,
@@ -86,7 +87,11 @@ export class CarouselListComponent implements OnInit {
         this.createInitialModel();
     }
 
-    public async switchDiscoverMode(newMode: DiscoverOption) {
+    public async toggleChanged(event: MatButtonToggleChange) {
+        await this.switchDiscoverMode(event.value);
+    }
+
+    private async switchDiscoverMode(newMode: DiscoverOption) {
         if (this.discoverOptions === newMode) {
             return;
         }
diff --git a/src/Ombi/ClientApp/src/app/settings/update/update.component.html b/src/Ombi/ClientApp/src/app/settings/update/update.component.html
index 6d0688697..52cf9c19e 100644
--- a/src/Ombi/ClientApp/src/app/settings/update/update.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/update/update.component.html
@@ -1,6 +1,6 @@
 
 <settings-menu></settings-menu>
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Update-Settings'"></wiki>
+<wiki [path]="'https://github.com/tidusjar/Ombi/wiki/Update-Settings'"></wiki>
 <div *ngIf="form" class="small-middle-container">
     <fieldset>
         <legend>Update Settings</legend>