#115 adding find after submit