Feature/1118 fix ask us to add links

See detailed description of issues to be fixed in #1118