Fix scope handling in manual submission interface