Index queue support improvements