Updating the c21_search feature