Changed the way some fields are indexed