Further fix for CargoSQLQuery field name changes