Added support for custom searching and improved wikitext regex