improve yaml substitution