more backports, added swisstopo