CRMT2: Bugfix
Shapefile export: fix/enhance