Refine submit status handling