Any update on this? We can't use the work around because we use the department field for something else.