Update option list to make request safer and responses by Yahoo more
consistent