tweak search utils for etcd access