Better support for searching and migrating collection views.