Replace NotFoundException with empty results list