#170 adding find after submit