fix of cql filter language and spacing problem