rework the way PageStore is loaded