+ filtering improvements.