Fix multishape datasets and adjust parser.