#334 adding find after submit