Task Type and Task Stage Issues Solved