Fixed issues with queries/tests related to latest Weaver changes.

552/569u tests pass.