Group titles

To be merged only when the core pr is merged