#664 adding find after submit