Revised search result model again.