Introduce advanced filtering, starting with merging fix-on-fix.