updates to the search section
no conflicts on merge