Correct, this solution scales more manually. This is because your radio buttons / checkboxes for department type can contain more than a 1:1 relationship and are “abnormal” in that respect. Adding more departments will require also adding more DB action handlers every time.
For the RG, would you mind sharing your Data Source expression? Sometimes a null row thrown in there can be the result of a merge or append action.