Fixed Task Validation and editing