*8212* move submission fetch outside of switch statement