Fixed: Only add/drop indexes if required.