fixed odd queries