Organise content by type in API output.
Render content from separate macro.
Render bill versions separately from other content.