Refactor cell search enhancements.