Fixes for CargoSQLQuery param name changes