fix core export, better handling of li matches