Lots more filtering improvements.