diff --git a/src/components/DeviceFilter.jsx b/src/components/DeviceFilter.jsx
index 704e51be..eaa252cc 100644
--- a/src/components/DeviceFilter.jsx
+++ b/src/components/DeviceFilter.jsx
@@ -286,7 +286,7 @@ export function initialiseFilter(filter) {
         if (filter.Type !== undefined) {
           tmp = [...filter.Type]
         }
-        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`))
+        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`).filter(s => s.length > 0))
 
         filter.Type = tmp
         filter.csvField = true
@@ -298,7 +298,7 @@ export function initialiseFilter(filter) {
         if (filter.Availability !== undefined) {
           tmp = [...filter.Availability]
         }
-        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`))
+        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`).filter(s => s.length > 0))
 
         filter.Availability = tmp
         filter.filterData = doSelectFilter
@@ -309,7 +309,7 @@ export function initialiseFilter(filter) {
         if (filter.Connection !== undefined) {
           tmp = [...filter.Connection]
         }
-        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`))
+        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`).filter(s => s.length > 0))
         filter.Connection = tmp
         filter.filterData = doConnectFilter
         filter.toUrl = () => encodeURI(tmp.join(`,`))
@@ -346,7 +346,7 @@ export function initialiseFilter(filter) {
         if (filter.Class !== undefined) {
           tmp = [...filter.Class]
         }
-        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`))
+        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`).filter(s => s.length > 0))
         filter.MarketedAs = tmp
         filter.filterOn = `Class`
         filter.filterData = doSelectFilter
@@ -357,7 +357,7 @@ export function initialiseFilter(filter) {
         if (filter.Anatomy !== undefined) {
           tmp = [...filter.Anatomy]
         }
-        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`))
+        tmp = tmp.concat(decodeURI(filter.urlData).split(`,`).filter(s => s.length > 0))
 
         filter.TargetAnatomy = tmp
         filter.filterOn = `Anatomy`