Added support for two columns in field-sets