Fix the resultset to new crossdata implementation