big refactoring: transfer from search by Object to search by ObjectId