query fix to ordered by time. query "or" to "and".
Merge pull request #2 from mackee/fix/ordered-and-between-query

query fix to ordered by time. query "or" to "and".