regex fix for datavis feed
templating optimsation