Add support for wbsearchentities