Fixed some issues with the dictionary form field