Added field escaping in sql builders