made several small changes, tried to implement filtering again but faile...

...d again