improve the parsing of multiple entities