#529 adding find after submit