fixed query again