add time control for 0
Add city name support