#545 add find after submit