fix map_set issue and varmap naming issue