Fix content association to layer