Add a filter by user and due date + minor changes