Enhance show defaults

Change-Id: I1403509654540602ffc2f23c87b29fcc1868ff52