restructure store error markup