sandstorm's attributes_matching code changes