Raw data routes & template tweaks