ENG-4686 ENG-4861 better agreement diagnotistics, and unwitnessed filtering