#332 adding find after submit