#229 adding find after submit