#24650 Added additional hook lookup formats.