Added support to search for keys by string or keyid