improved: removed 'toquote' flag

- directly added quotes in wrap