Fixed submission loader using submitted mode instead of override