Fixes and updates, in particular, filtering