fixed queries based on new tests.