Bug#1222698 fix and enhanced note display