fixes to multiple stores per study
Fixing merge issues