fixed issues with data elements not updating appropriately