add some user input validation, limit number of results
add some translations
add some more sanity checks
Merge branch 'master' of github.com:gisclient/branch-3.2