Properly update suggestion counts on suggestions import
Move suggestion adding to unit class