Fix Move higher level Index related ops to IRepository #822