Filtering + some refactoring on the other tasks