Add new filters
Fix a a bug with one filter
Add a filter for Country: 'Column'
Closes #90
Merge branch 'enhancement-#90' into web