optimise upcoming_events tag query by only selecting the fields we actually use
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop