Combine simplified and non-simplified shapefile tables

See commit message