Added services and raceway highways to 'order' section
Pull from osmand