[#42050241] Fix bug fix for empty term name; Marked required fields