Handle suggestion count discrepency more robustly