Fix export for new unified key list #409

Fixes issue #409