FIX: Use container determined in find_container() when setting search value