fixes, cleanup, and increase timout for DataSets editing page