MAL-106 MAL-80 MAL-86| Fix maps and allow tags in wysiwyg

Prepend with module name