Fix "Update view" overflow issues