Inward: Patch 0.4452

Minor database optimisation to reduce reads. Thanks,