#337 adding find after submit