Filtering has improved quite a lot now

I still need run a few tests and improve colour assignment