handle multiple select case, imrove naming