ISPN-4557 Fix the AS-Embedded modules's capability to run Query

All tests pass for me. Please try