Simplify and improve Collect and Search

Collect only does the collection, Search only display result.

Add some convenience functionalities
Fix various minor bugs and make some simplifications