Fix for raw query export.
Support for multi-column pks in reflection.