Optimized searching a bit
Fixed merge conflicts and went back to using isEqual: for comparing objects in search