Some tweaks to TaskItem. AppSearch removed