Improve select box empty option logic

- Department is no longer an object
- Remove required attribute from select boxes