Improve selecting keywords from uploaded JSON

For now, the JSON file must have a field called 'name' for search to
work.
Merge branch 'master' into gh-pages