bugfix plus filter update for missing hits
bug fix
Merge pull request #4578 from perrotta/backportOf4391To71X

Bugfix plus filter update for missing hits, backport of #4391 to 71X