#291 adding find after submit