Improvements  on index queue support