#110 adding find after submit