Fix issues with forms displaying Year and Category drop down fields