Moved some code to the article form to make the ArticlePreHandler cleaner