diff --git a/origin/origin_channels.py b/origin/origin_channels.py
index 4bbd169..cd576b7 100644
--- a/origin/origin_channels.py
+++ b/origin/origin_channels.py
@@ -25,13 +25,20 @@ class OriginChannels():
     def filterlist(self, unfiltered_chan_json):
         filtered_chan_list = []
         for channels_item in unfiltered_chan_json:
+            filters_passed = True
             for filter_key in list(self.origin.filter_dict.keys()):
 
-                chan_filter_values = []
+                if filters_passed:
 
-                if filter_key in ["country", "language"]:
-                    for filter_subkey in ["code", "name"]:
-                        chan_filter_values.append(channels_item[filter_key][filter_subkey])
+                    filter_values = self.origin.filter_dict[filter_key]
+
+                    if filter_key in ["country", "language"]:
+                        chan_value = channels_item[filter_key]["name"]
+
+                    if chan_value.lower() not in [x.lower() for x in filter_values]:
+                        filters_passed = False
+            if filters_passed:
+                filtered_chan_list.append(channels_item)
 
         return filtered_chan_list