Fix Department tagging