/search/concepts and /search/collections
merging in jon's changes on dev after conflict
added option to select a template