harmonize span query parser and regular parser