Updated support for toggle layers by parameter