diff --git a/src/app/components/programs/programs-list.component.html b/src/app/components/programs/programs-list.component.html
index 098ba05..a257eec 100644
--- a/src/app/components/programs/programs-list.component.html
+++ b/src/app/components/programs/programs-list.component.html
@@ -1,61 +1,55 @@
 <app-program-favorites></app-program-favorites>
+<p-accordion>
+    <p-accordionTab header="{{'Categories' | translate}}">
+        <p-selectButton [options]="categoryOptions" [(ngModel)]="localState.selectedCategory" optionLabel="label" optionValue="value"
+        (onChange)="onCategoryChanged($event, dt2)"
+        ></p-selectButton>
+    </p-accordionTab>
+</p-accordion>
 
-<div class="programs-list">
-    <p-table #dt2 [value]="programs" responsiveLayout="stack" [paginator]="true" [rows]="pageSize" [totalRecords]="totalHits" (onLazyLoad)="loadLazy($event)" [lazy]="true"
-        [globalFilterFields]="['name','channel.name','description']" styleClass="sr-table">
-        <ng-template pTemplate="caption">
-            <span>
-                <p-accordion>
-                    <p-accordionTab header="{{'Categories' | translate}}">
-                        <p-selectButton [options]="categoryOptions" [(ngModel)]="localState.selectedCategory" optionLabel="label" optionValue="value"
-                        (onChange)="onCategoryChanged($event, dt2)"
-                        ></p-selectButton>
-                    </p-accordionTab>
-                </p-accordion>
-            </span>
-        </ng-template>
-        <ng-template pTemplate="header">
-            <tr>
-                <th class="min-title-column" pSortableColumn="name">{{'ProgramNameTitle' | translate | uppercase }}<p-sortIcon field="name">
-                    </p-sortIcon>
-                </th>
-                <th pSortableColumn="channel.name">{{'ChannelNameTitle' | translate | uppercase }}<p-sortIcon
-                        field="channel.name">
-                    </p-sortIcon>
-                </th>
+<p-table #dt2 [value]="programs" responsiveLayout="stack" [paginator]="true" [rows]="pageSize" [totalRecords]="totalHits" (onLazyLoad)="loadLazy($event)" [lazy]="true"
+    [globalFilterFields]="['name','channel.name','description']" styleClass="sr-table">
+    <ng-template pTemplate="header">
+        <tr>
+            <th class="min-title-column" pSortableColumn="name">{{'ProgramNameTitle' | translate | uppercase }}<p-sortIcon field="name">
+                </p-sortIcon>
+            </th>
+            <th pSortableColumn="channel.name">{{'ChannelNameTitle' | translate | uppercase }}<p-sortIcon
+                    field="channel.name">
+                </p-sortIcon>
+            </th>
 
-                <th>{{'Description' | translate | uppercase}}</th>
-            </tr>
-        </ng-template>
-        <ng-template pTemplate="body" let-program>
-            <tr>
-                <td class="min-title-column">
-                    <div class="p-grid" style="width:100%">
-                        <span (click)="onProgramDetails(program)" class="clickable p-col-8">
-                            <img src={{program.programimage}} class="image-thumb" />
-                            <span *ngIf="program?.channel" class="prg-chan">
-                                {{program.channel.name}}
-                            </span>
-                            <span class="prg-title">
-                                {{program.name}}
-                            </span>
+            <th>{{'Description' | translate | uppercase}}</th>
+        </tr>
+    </ng-template>
+    <ng-template pTemplate="body" let-program>
+        <tr>
+            <td class="min-title-column">
+                <div class="p-grid" style="width:100%">
+                    <span (click)="onProgramDetails(program)" class="clickable p-col-8">
+                        <img src={{program.programimage}} class="image-thumb" />
+                        <span *ngIf="program?.channel" class="prg-chan">
+                            {{program.channel.name}}
                         </span>
-                        <span class="p-col-4" style="float:right;padding-top:0px">
-                            <span class="clickable" (click)="onProgramDetails(program)"><i
-                                    class="pi pi-info-circle details-btn"></i>
-                            </span>
+                        <span class="prg-title">
+                            {{program.name}}
                         </span>
-                    </div>
-                </td>
-                <td class="prg-chan-td">
-                    <div *ngIf="program?.channel">
-                        {{program.channel.name}}
-                    </div>
-                </td>
-                <td class="description-td" style="border:none">
-                    {{program.description}}
-                </td>
-            </tr>
-        </ng-template>
-    </p-table>
-</div>
\ No newline at end of file
+                    </span>
+                    <span class="p-col-4" style="float:right;padding-top:0px">
+                        <span class="clickable" (click)="onProgramDetails(program)"><i
+                                class="pi pi-info-circle details-btn"></i>
+                        </span>
+                    </span>
+                </div>
+            </td>
+            <td class="prg-chan-td">
+                <div *ngIf="program?.channel">
+                    {{program.channel.name}}
+                </div>
+            </td>
+            <td class="description-td" style="border:none">
+                {{program.description}}
+            </td>
+        </tr>
+    </ng-template>
+</p-table>
\ No newline at end of file
diff --git a/src/app/services/programs.service.ts b/src/app/services/programs.service.ts
index 682c445..86ab7f6 100644
--- a/src/app/services/programs.service.ts
+++ b/src/app/services/programs.service.ts
@@ -27,7 +27,7 @@ export class ProgramsService extends SRBaseService {
       fav: false,
       channel: {
         id: p?.channel.id,
-        name: p?.channel.name
+        name: p?.channel.name === '[No channel]' ? '' : p?.channel.name
       },
       programimage: p.programimagetemplate + SRApiService.DefaultImagePreset,
       description: p.description,