Implemented new version of CQL filter with basic and advanced editing environment