code cleanup

Change-Id: I87e15724373f24b200cb50d3ff55a9579095d5bc
Added option to hide record identifier info when no probe info
available.

Change-Id: Ie333c3016afbb0a4b254ba8965daf1134633a808