continuing to fix query...