#224 adding find after submit