Added no results found scenario handling