added support for Search request + experimental self.ref