(feat) Fix route handling for submit