VID-1308 key/value pair alignment