Updated search for any-value-search