Improved algorithm for Municipal and State Highway

Improved algorithm to identify Municipal and State Highways, and
rendering highway=bridleway as tracktype=grade1