Issue with highlighting cells after collapse/expand