Index semantics improvement