Little bug fixes, added simple filter as an experiment