Issam/Shawn-2503 fixing search result when return nothing