Fixed query to handle multiple until and since statments. Also able to handle multiple terms in any location of the query.