(bug) still fixing query