#83 adding find after submit