Fixed #246 Make sure the -none- and default to be the 1st and 2nd selections in the drop down