Harvesting CSW and WMS improvements