Per-instr looping filter mapping
Bug fixes