Better default ad tags.
Merge branch 'master' into init-map