Added new work tags and updated auto tagging code