fixes to correct for the fact that some curies may have both a colon and an underscore so we cannot do a simple replace, expansion on curies now works correctly, but more bugs may crop up because some fragments have more than one underscore
fixes to correct for the fact that some curies may have both a colon and an underscore so we cannot do a simple replace, expansion on curies now works correctly, but more bugs may crop up because some fragments have more than one underscore

CheerfulTeapot/heatmaps,tgbugs/heatmaps,tgbugs/heatmaps,CheerfulTeapot/heatmaps