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

I just realized that #4391 from @matteosan1 was not backported yet to 71X.
It may be needed, however, for trigger developments and studies of the developing Run2 HLT menu, which have to be done in 71X