add msearch support