Fix wonky time issues and finish extracting TaskFilter class