Fix index column mapping