Nominatim fixes
Ruian fixes