Reworked indices for improved query speed and decreased database size.