Revert "Revised WFS query"

This reverts commit af6f19267d5bd4c636bcaf488bc01d280f0efb7c.