Improved Q/drawers to handle initial.index=0