Improve tasks waiting results