Fix #1158 for F30
Address felixcat comments.
Merge pull request #1199 from Sophist-UK/enhance_link_element_f30

Fix #1158 for F30