Fixing related issues user links