allow morelinks on spans (e.g. inside buttons)
rm morelink hack as it breaks on linebreaks
Merge branch 'develop' into geo