Partially implement the search design changes.