UC-1990 return empty collection instead of null