added option to show record identifiers when no probe info available
(default off).
code cleanup.

Change-Id: Ic3a72469dad2ade7c157d3ea0c9c362c83b9ac43