Improvement on index queue support