Green Up Green Down map layer and CQL fix