BUG fixes to SQLQuery::normalisePredicates and DataObject::get_one