#510 adding find after submit