#514 adding find after submit