Fix a search that should have been find
Fix references not coming from a content file incorrectly overwriting each other