Fix index fields