Add hack to support expanding item ids