Update Entity Extraction Logic in firstEntity Function

[Pasanmahee]

Is your pull request related to a problem? Please describe

A clear and concise description of what the problem is. Ex. I'm always frustrated when ...

Describe the solution you'd like

A clear and concise description of what you want to happen.

Describe alternatives you've considered

A clear and concise description of any alternative solutions or features you've considered.

Additional context

Add any other context or screenshots about the feature request here.

Test plan

A good test plan should give instructions that someone else can easily follow.
Also add a link to your own Messenger experience for your reviewer to test the changes.

Checklist

• [x ] My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.
• [x ] The title of my pull request is a short description of the requested changes.
• I have added the label enhancement to my pull request.