WFS: take correctly into account XML comments in filters (#4986)