fixing issues with refresh data