Tweaked tag mappings