Further groovydoc and filters refactoring