Add PersonTags as well. Performed a simple test but not extensive regression