Improved nbsp highlight