Upgrade TAG more browser compliant