Added correction for "not" and "and" keywords nospace bug.