Fix country select dropdown, some js work