Suggestions update
Added functionality in template
Follow-up on review
Merge pull request #120 from Coenego/did-you-mean-extra

Suggestions update