attempting to fix queries