Use property names in choice template instead of indexes