#242 adding find after submit