Updated wiki feature. Fixes #1647