Fixes for index queueing
Typo fix
Merge pull request #1805 from elzj/queue_changes

Issue 4078: Fixes for index queueing