made quoting of SQL vars more consistent