Correct University of Geneva and Highway heading