#281 adding find after submit