Adding support for no results