Some refinements
Removed pre-defined containers from search.