address comments, and mistaken unique flag on office_slug