improved filter dsl, seems to be working right