More improvements to the wiki module...