Fix #670, properly update drop down options