Mouse over text fixes
Better handling of text in brackets in merge