#155 adding find after submit