Improve layout parsing and allow using long names for speakers