#159 adding find after submit