Rationalise OA links to come after form submission.