More Shapefile Layer enhancements/fixes, these are working in DRMP
template