#235 add find after submit