Fix npe with unfiltered list