Use Taglib for link on inst. Details
APD-442 fix
Merge branch 'APD-412' into develop