Fixed cashe error, and row javascript error