Reindex new columns
Optimise queries