1. bugfix: wikipedia template URL; 2. use underscore for space in links
typo