Added support for xwing search.