Add fields to order index