Update variable names in asset map on select

Fixes #84

Also prevents a similar problem from occurring with keywords.