Improved wikisafe helper. Tested with github RAML