First version of search results
Fix name with optional values