#88 add find after submit