Minor changes in elegant dumper
Add quoting to substitution