fix wikipedia = http
combine ways into relation and move wikipedia to parent
add wikipedia
fix typo
fix tags