Spacing fixes after entities and multiple formats