parse-query changes

Type of change

• Bug Fix
• Feature

Issue: #104

Does this introduce a change in the core logic?

• [YES]

Does this introduce a breaking change?

• [NO]

What is the current behavior?

• It's failing to parse the query containing the string with "OR" or "AND" as an operator which shouldn't be

What is the new/expected behavior?

• Now it's parsing the query normally, it can distinguish operator and part of the string

Have you added/updated Unit Tests and Integration Tests?

• coming soon

Any other useful information