slightlly better handling for searchs and search results