Revert "WFS query revision"

This reverts commit 1916f08ac369cfc4c6a486b4a5c34a2655e6dc19.