Code fixup, incomplete remove/replace of study global id with persistent URI