Change usage of WB sel for individual control