optimized 'queries()' mixin; moving back now