Yes, I agree that it's not a perfect solution. Your solution with handler options for the unmapped fragment ions might help here. We just need to make sure that users really understand that if they overwrite the options, this will lead to a potentially misleading target-decoy model.