Tweaked the suggestions logic to be more accurate