Bugfixes and more filters