Indexes: Several perfomance improvements