Stats - Improve highlight status of tapped bars

Fix #1644 and #1649