Fix with_value spec and value_hash based search.