#471 adding find after submit