Fixes for the new suggest feedback