SSP-2301 - Unpredictable MAP term note display
*Code around hibernate object tracking