#342 Adding find after submit