Change property to use for subject label, and link with ID (#225)