WFS improvements, and fix Esri MapServer items.