Improve handling of suggestions

By handling them as regular entries