Added simplified index search