Update to show points and polygons with proper file names