Beefing up detail from NPE and local_knowledge

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