Modified templates.
Fix advertiser detection.