Quoting fields through lib.
Escaping values to support default.
Removed unused variable.