Fixing some regexp
Added support for headings to separate group stages