Grids: Fixed assocation of labels to form fields (fixes #2638)