Fix index search