Updated setting selected attribute for new options
Some code tidying