Issue/1633 - Make Target labels clickable

#1633