added support for hcpid in search