Pull Request 2 Dev 1.1

Done po, done it to filter and sort for my threads as well :bow: