#156 adding find after submit