[Finishes #63591078] rework the ogre tables