Fix for a gap in the suggestion list / not all choices rendering #HOT-32
Merge branch 'feature/hot-32' into develop