Update annotation_map.md

Reviewed mappings and added missing ones.