wattr, mapw: moved mapping check to wattr (m attribute)