Fix customSelect regressions