Validate place name in Query.
Merge branch 'master' of github.com:Xian618/happyhouse2