#158 adding find after submit