Cleaned up CQL/OGC filtering section