FS#1838 - fixes to oliver's subtasks changes