Fixed issue of not extracting entity