Added support for OGC filter and test