Add additional indices to improve report performance