Fixed some select validation issues