options_for_select added
fix map function