possibly fixed query finally