UK to focus on age, not occupation for next vaccines