Bugfix - some param sets were getting lost during batch creation