Fix queue find_and_replace