(maint) Query now works