Fix return of empty sets/arrays