Fix double path replacement for nested query
Description:
Fix for nested queries & test refactoring
Changes include:
-
Bugfix (a non-breaking change that solves an issue).
Changes in:
-
Common code
Dev Checklist:
-
Added Unit Tests, wherever applicable. -
Existing Tests pass -
Verified functionality locally -
Self Reviewed my code for formatting and complex business logic.