Fixed empty model persisted loading