fix stores and routes