more fixes to quote issue