Add handling for no results