#276 adding find after submit