Make map directive watch map expr