#318 adding find after submit