Small improvement to main routes