Fix results index issues