#460 find after submit