Refactor to SearchEntry