DDF-604: Added code to include keywords for wfs 2.0 query