#457 add find after submit