#330 adding find after submit