Fixed the request mapping
Added error messages for empty results set