fixes whitespacing
fixes NPE in iterator of filtered getEntries