Drop down select fixes