Map for AEWA + fixes for node->language