Change how the YAQL fields are displayed

Change-Id: I2c311bd0822232ce237f7bf9e052786d955de269