Fixes issue #903, now checks for metadata column if mapping file provided