Fixed expandables and tags so they can contain headings!