merging
Trying to be safer about how previews determine the queue starting index. bug 730
Better fix for preview index