Fix issue for multiple selects