additional fixes for #2257 (Custom select compatibility)