Change to structure. Preparation for search result list.