#266 adding find after submit