Add store names, re-organize index yet again