Tweaks to derived value updater

Reducing number of records, and fixing detection of relationships.