added search only support