Use different approach for collection zone-data too

Use different approach for collection zone-data too #6015