Fix entry suggestions

Related to #2288