link to controlled-vocab terms in entity topics,facility edit fields

This commit restores changes from the 100-cvpopup branch that
were obliterated during the recent merge-fest.