Fix index creation to respect mappings from config.