Close #645 - Fix for search with no result