TRQ-2966 account for TM tasks
Changes added to correctly account for TM tasks