Added support for multi-index search