two location query works
Merge branch 'db_change' of https://github.com/TZ2016/DailyRoute into db_change