Fixes and improvements to Clean Tooltips