Sync ssot

Placeholder, needs more tests and comments. 
Rename the string findById to findByRecord. Think about the labeling issue