Fix for opt out tags when used with T&T