Minor changes. Next: rework csv mapping with NwDbEntry