Break out and redesign search and query builder