V2.6 fixes for resource index

@ndushay