Improve refresh data performance. Fix delete error problem