Pull Request 2 Dev 1.1

Done po and done it also to all filters :bow: