Changes to resource index logic