Minor fix - use conditional QI table based on usage scenario