[OE-3728] Minor procedure selection style tweaks