entity parser fixed