Improve mapping for re highlighting last pasted text