tried to fix query bug
tried to fix again