Added auto-support for selection boxes