multi stores fixes