Improved highlighting on Android