Added 'no results' functionality + minor changes