Minor database optimisation to reduce reads.

Thanks,