Stats - Improve highlight stats of tapped bar

Fix #1644 and #1649