Fixed highlight badges not being shown properly.