WFS improvements for 1.1