Adding mobile select support