Fixing searchAll, where at some point some object reference where changed