Added support for Feature Service query