Added key/value pattern searching