GBE-438: Additional improvements for retrieving shapefile from datastore.