IDX update 3

Some index modifications.