Add 'container' property on hint options