Use UnionFilter for handling type: and type-ref: queries.
Merge branch 'typedefs' of github.com:abbeyj/dxr into typedefs