watcher.js - all the PK-definition and the entity-lookup issues fixed