Standardize return of getEntitiesContaining() from Set to Collection