#353 adding find after submit