LPS-39097 Alloy - added in additional dynamic query support