so the ideal fix for exclude logic will involve refactor BuildFileAddressMapper. I would love to work on that. But given the timeframe of release and possible iterations in the code review, I think for now I will adopt @limited-country-20626’s fix, and add test coverage for that. I will try to get that land today, and create a new ticket for refactoring. @witty-crayon-22786 @rough-minister-58256 @wide-energy-11069