Fixed issue with unloading view when waiting for tableview updates to finish