Still fiddling with filtering

Still fiddling with filtering.