Add _ENTRY to map macro element names