Move =_filter()= out of class
Handle value lists
Adjust tests
Merge branch 'add-spaces'