Improved handling of ENC and WMS layer settings