Updating queries to stop pulling in unused indexes.