improved task id support