#389 adding find after submit