Nice refactor of the search map destructuring.