Beefing up detail from NPE and local_knowledge

https://api.openstreetmap.org/user/Tali'sman/diary/7966