Correct order secondary vs tertiary highway

This resolves #862.