Map terminals

Grammar definition was outdated and had some terminals missing related to maps, which @jfacorro added.