fix #34 - Group fields in fielsets