consolidate state/@type='office' #226