fixes for nature_reserve and water
re-ordered roads and mtb layer