Add structure for search options and search-by-collection