rp_task_select_next mixing index and id

Analyzing the rp_task_select_next function we have a hard time to understand the implementation since it mixes ID and index. In debugging we believe we have seen mixups in the actual structure (e.g. the hook id does not always match). 
Can we anticipate an update of this function, and if so when?

