Fix layer.name
Add subLayersByName