Merge pull request #376 from nla/ti_collection_search

Collection Search
Merge branch 'master' into ti_collection_search