Fix some bugs and update the select city dropdown when user select a city