Update to fix dual insertion of data nodes and to get Refresh Data button to work