diff --git a/src/app/components/tableComponents/cell/cell.component.html b/src/app/components/tableComponents/cell/cell.component.html
index dd76e27..a4a11fd 100644
--- a/src/app/components/tableComponents/cell/cell.component.html
+++ b/src/app/components/tableComponents/cell/cell.component.html
@@ -51,6 +51,7 @@
       [required]="required"
       [disabled]="!editable"
     >
+      <mat-option [value]="null"></mat-option>
       <mat-option *ngFor="let option of enumValues" [value]="option">
         {{ option }}
       </mat-option>
@@ -111,9 +112,7 @@
   </mat-form-field>
   <ng-template #nonEditableText>
     <ng-container *ngFor="let link of value">
-      <a mat-button color="primary" [href]="link">{{
-        link
-      }}</a>
+      <a mat-button color="primary" [href]="link">{{ link }}</a>
     </ng-container>
   </ng-template>
 </div>
diff --git a/src/app/components/tableComponents/filter-row/filter-row.component.html b/src/app/components/tableComponents/filter-row/filter-row.component.html
index 6c6c45a..a6b27f3 100644
--- a/src/app/components/tableComponents/filter-row/filter-row.component.html
+++ b/src/app/components/tableComponents/filter-row/filter-row.component.html
@@ -114,3 +114,13 @@
   >
   </app-date-range-cell>
 </ng-container>
+
+<!-- DateRange Filter -->
+<app-cell
+  *ngIf="column.type.startsWith('Enum')"
+  [editable]="true"
+  [(value)]="filter.value"
+  (valueChange)="newFilterValue()"
+  [inputType]="column.type"
+>
+</app-cell>
diff --git a/src/app/helperFunctions/customTableFilterFunction.ts b/src/app/helperFunctions/customTableFilterFunction.ts
index 7d0b440..8887d04 100644
--- a/src/app/helperFunctions/customTableFilterFunction.ts
+++ b/src/app/helperFunctions/customTableFilterFunction.ts
@@ -147,6 +147,10 @@ export function customTableFilterFunction(data: any, filter: any) {
         return false;
       }
     }
+    // Enum Filter
+    if (filterElement.type.startsWith('Enum') && filterElement.value != null && filterElement.value !== data[filterElementName]) {
+        return false;
+    }
   }
   /*const b =
       !filter.includesString ||