refactoring to avoid AD Blocker filtering