#227 adding find after submit