Removing fault-prone IF on Search same