IMG-613 Set focus back to link - clean-up, sorry for multiple commits