Changed: Will handle 'NoIndex' indices