fixed Grid Data layer issues