#340 adding find after submit