Revert "Change Suggestion limit to 16"

This reverts commit 3274004212d1f72f94b9832cb3c5ff7f2eed4291.