Totally broken but good progress
Finally fixed insidious bug in filters